Skip to content

Fix OpenTelemetry & Prometheus without FastStream #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 30, 2025
Merged

Fix OpenTelemetry & Prometheus without FastStream #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
160e934
Fix OpenTelemetry & Prometheus without FastStream
vrslev Oct 30, 2025
5f0ac94
Remove unnecessary type ignore comment for prometheus middleware assi…
vrslev Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions microbootstrap/instruments/opentelemetry_instrument.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import pydantic
import structlog
from faststream._internal.types import BrokerMiddleware
from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
from opentelemetry.instrumentation.dependencies import DependencyConflictError
from opentelemetry.instrumentation.environment_variables import OTEL_PYTHON_DISABLED_INSTRUMENTATIONS
Expand Down Expand Up @@ -70,7 +69,7 @@ class OpentelemetryConfig(BaseInstrumentConfig):


@typing.runtime_checkable
class FastStreamTelemetryMiddlewareProtocol(BrokerMiddleware, typing.Protocol):
class FastStreamTelemetryMiddlewareProtocol(typing.Protocol):
def __init__(
self,
*,
Expand All @@ -79,6 +78,14 @@ def __init__(
meter: Meter | None = None,
) -> None: ...

def __call__(
self,
msg: typing.Any, # noqa: ANN401
/,
*,
context: typing.Any, # noqa: ANN401
) -> typing.Any: ... # noqa: ANN401


class FastStreamOpentelemetryConfig(OpentelemetryConfig):
opentelemetry_middleware_cls: type[FastStreamTelemetryMiddlewareProtocol] | None = None
Expand Down
10 changes: 8 additions & 2 deletions microbootstrap/instruments/prometheus_instrument.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import typing

import pydantic
from faststream._internal.types import BrokerMiddleware

from microbootstrap.helpers import is_valid_path
from microbootstrap.instruments.base import BaseInstrumentConfig, Instrument
Expand Down Expand Up @@ -34,7 +33,7 @@ class FastApiPrometheusConfig(BasePrometheusConfig):


@typing.runtime_checkable
class FastStreamPrometheusMiddlewareProtocol(BrokerMiddleware, typing.Protocol):
class FastStreamPrometheusMiddlewareProtocol(typing.Protocol):
def __init__(
self,
*,
Expand All @@ -44,6 +43,13 @@ def __init__(
received_messages_size_buckets: typing.Sequence[float] | None = None,
custom_labels: dict[str, str | typing.Callable[[typing.Any], str]] | None = None,
) -> None: ...
def __call__(
self,
msg: typing.Any, # noqa: ANN401
/,
*,
context: typing.Any, # noqa: ANN401
) -> typing.Any: ... # noqa: ANN401


class FastStreamPrometheusConfig(BasePrometheusConfig):
Expand Down
2 changes: 1 addition & 1 deletion tests/instruments/test_prometheus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ async def test_faststream_prometheus_custom_labels(
expected_label_keys: set[str],
) -> None:
minimal_faststream_prometheus_config.prometheus_custom_labels = custom_labels
minimal_faststream_prometheus_config.prometheus_middleware_cls = RedisPrometheusMiddleware # type: ignore[assignment]
minimal_faststream_prometheus_config.prometheus_middleware_cls = RedisPrometheusMiddleware

broker: typing.Final = RedisBroker()
(
Expand Down