Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions connectrpc-otel/connectrpc_otel/_instrumentor.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@
from collections.abc import Callable, Collection
from types import ModuleType

from connectrpc.interceptor import Interceptor, InterceptorSync
from opentelemetry.metrics import MeterProvider
from opentelemetry.trace import TracerProvider

from connectrpc.interceptor import Interceptor, InterceptorSync
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@stefanvanburen I think you may have set up imports like this as first-party elsewhere. Personally, I find the default of treating workspace members as third-party ok since I don't see particularly better readability otherwise, and then we get it with no manual config

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, I really don't mind either way, all a matter of taste/consistency. works for me.


_instruments = ("connectrpc>=0.9.0",)

P = ParamSpec("P")
Expand Down
3 changes: 1 addition & 2 deletions connectrpc-otel/connectrpc_otel/_interceptor.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from contextlib import AbstractContextManager, contextmanager
from typing import TYPE_CHECKING, TypeAlias, TypeVar, cast

from connectrpc.errors import ConnectError
from opentelemetry.metrics import MeterProvider, get_meter_provider
from opentelemetry.propagate import get_global_textmap
from opentelemetry.propagators.textmap import Setter, TextMapPropagator, default_setter
Expand All @@ -16,8 +17,6 @@
)
from opentelemetry.util.types import AttributeValue

from connectrpc.errors import ConnectError

from ._semconv import (
CLIENT_ADDRESS,
CLIENT_PORT,
Expand Down
3 changes: 3 additions & 0 deletions connectrpc-otel/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,6 @@ build-backend = "uv_build"
[tool.uv.build-backend]
module-name = "connectrpc_otel"
module-root = ""

[tool.ruff]
extend = "../pyproject.toml"
9 changes: 4 additions & 5 deletions connectrpc-otel/test/test_instrumentor.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
from typing import TYPE_CHECKING, Literal

import pytest
from connectrpc_otel import ConnectInstrumentor, OpenTelemetryInterceptor
from connectrpc.code import Code
from connectrpc.errors import ConnectError
from example.eliza_connect import (
ElizaService,
ElizaServiceASGIApplication,
Expand All @@ -21,19 +22,17 @@
from pyqwest import Client, SyncClient
from pyqwest.testing import ASGITransport, WSGITransport

from connectrpc.code import Code
from connectrpc.errors import ConnectError
from connectrpc_otel import ConnectInstrumentor, OpenTelemetryInterceptor

if TYPE_CHECKING:
from connectrpc.request import RequestContext
from opentelemetry.metrics import MeterProvider
from opentelemetry.sdk.metrics.export import InMemoryMetricReader
from opentelemetry.sdk.trace import TracerProvider
from opentelemetry.sdk.trace.export.in_memory_span_exporter import (
InMemorySpanExporter,
)

from connectrpc.request import RequestContext


class ElizaServiceTest(ElizaService):
async def say(self, request: SayRequest, ctx: RequestContext) -> SayResponse:
Expand Down
9 changes: 4 additions & 5 deletions connectrpc-otel/test/test_interceptor.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
from typing import TYPE_CHECKING, cast

import pytest
from connectrpc_otel import OpenTelemetryInterceptor
from connectrpc.code import Code
from connectrpc.errors import ConnectError
from example.eliza_connect import (
ElizaService,
ElizaServiceASGIApplication,
Expand All @@ -24,20 +25,18 @@
from pyqwest import Client, SyncClient
from pyqwest.testing import ASGITransport, WSGITransport

from connectrpc.code import Code
from connectrpc.errors import ConnectError
from connectrpc_otel import OpenTelemetryInterceptor

if TYPE_CHECKING:
from asgiref.typing import ASGIApplication
from connectrpc.request import RequestContext
from opentelemetry.sdk.metrics import MeterProvider
from opentelemetry.sdk.metrics.export import Histogram, InMemoryMetricReader, Metric
from opentelemetry.sdk.trace import TracerProvider
from opentelemetry.sdk.trace.export.in_memory_span_exporter import (
InMemorySpanExporter,
)

from connectrpc.request import RequestContext


class ElizaServiceTest(ElizaService):
async def say(self, request: SayRequest, ctx: RequestContext) -> SayResponse:
Expand Down
Loading