|
3 | 3 | import logging |
4 | 4 | import os |
5 | 5 | import sys |
6 | | -import threading |
7 | 6 | from typing import List |
8 | | -from urllib.parse import urlparse |
9 | | -from wsgiref.simple_server import make_server |
10 | 7 |
|
11 | | -from prometheus_client import make_wsgi_app |
12 | 8 | from pythonjsonlogger import jsonlogger |
13 | | -from temporalio.client import Client, TLSConfig |
| 9 | +from temporalio.client import Client |
14 | 10 | from temporalio.runtime import ( |
15 | 11 | LoggingConfig, |
16 | 12 | PrometheusConfig, |
17 | 13 | Runtime, |
18 | 14 | TelemetryConfig, |
19 | 15 | TelemetryFilter, |
20 | 16 | ) |
| 17 | +from temporalio.service import TLSConfig |
21 | 18 | from temporalio.worker import Worker |
22 | 19 |
|
23 | 20 | from activities import delay_activity, noop_activity |
@@ -125,22 +122,11 @@ async def run(): |
125 | 122 | logger.addHandler(logHandler) |
126 | 123 | logger.setLevel(nameToLevel[args.log_level.upper()]) |
127 | 124 |
|
128 | | - # Configure metrics |
129 | | - prometheus = None |
130 | | - if args.prom_listen_address: |
131 | | - prom_addr = urlparse(args.prom_listen_address) |
132 | | - metrics_app = make_wsgi_app() |
133 | | - handle_path = args.prom_handler_path |
134 | | - |
135 | | - def prom_app(environ, start_fn): |
136 | | - if environ["PATH_INFO"] == handle_path: |
137 | | - return metrics_app(environ, start_fn) |
138 | | - |
139 | | - httpd = make_server(prom_addr.hostname, prom_addr.port, prom_app) |
140 | | - t = threading.Thread(target=httpd.serve_forever) |
141 | | - t.daemon = True |
142 | | - t.start() |
143 | | - prometheus = PrometheusConfig(bind_address=parser.prom_listen_address) |
| 125 | + prometheus = ( |
| 126 | + PrometheusConfig(bind_address=args.prom_listen_address) |
| 127 | + if args.prom_listen_address |
| 128 | + else None |
| 129 | + ) |
144 | 130 |
|
145 | 131 | new_runtime = Runtime( |
146 | 132 | telemetry=TelemetryConfig( |
|
0 commit comments