Skip to content

Commit b5b0fe5

Browse files
committed
ps util made optional
1 parent a5da476 commit b5b0fe5

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

middleware/distro.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@
88

99
import pkg_resources
1010
from opentelemetry.instrumentation.distro import BaseDistro
11-
from middleware.metrics import create_meter_provider
11+
try:
12+
from middleware.metrics import create_meter_provider
13+
PSUTIL_AVAILABLE = True
14+
except ImportError:
15+
PSUTIL_AVAILABLE = False
16+
1217
from middleware.options import MWOptions, parse_bool
1318
from middleware.resource import create_resource
1419
from middleware.trace import create_tracer_provider
@@ -80,7 +85,10 @@ def mw_tracker_internal(
8085
if options.collect_traces:
8186
create_tracer_provider(options, resource)
8287
if options.collect_metrics:
83-
create_meter_provider(options, resource)
88+
if PSUTIL_AVAILABLE:
89+
create_meter_provider(options, resource)
90+
else:
91+
_logger.warning("Metrics collection skipped - psutil not available")
8492
if options.collect_logs:
8593
handler = create_logger_handler(options, resource)
8694
logging.getLogger().addHandler(handler)

pyproject.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "middleware-io"
7-
version = "2.4.1rc22"
7+
version = "2.4.1rc23"
88
requires-python = ">=3.8"
99
description = "Middleware's APM tool enables Python developers to effortlessly monitor their applications, gathering distributed tracing, metrics, logs, and profiling data for valuable insights and performance optimization."
1010
authors = [{ name = "middleware-dev" }]
@@ -41,7 +41,6 @@ dependencies =[
4141
"opentelemetry-resourcedetector-gcp==1.9.0a0",
4242
"opentelemetry-resourcedetector-docker==0.4.0",
4343
"gitpython>=3.1.0",
44-
4544
"opentelemetry-instrumentation-aio-pika==0.57b0",
4645
"opentelemetry-instrumentation-aiohttp-client==0.57b0",
4746
"opentelemetry-instrumentation-aiohttp-server==0.57b0",

0 commit comments

Comments
 (0)