Support OpenTelemetry 1.30.0 (#839)

Author: alexmojaki

logfire/_internal/ast_utils.py

@@ -106,7 +106,7 @@ def rewrite_function(self, node: ast.FunctionDef | ast.AsyncFunctionDef, qualnam
 
         return ast.fix_missing_locations(
             ast.copy_location(
-                type(node)(
+                type(node)(  # type: ignore
                     name=node.name,
                     args=node.args,
                     body=new_body,

logfire/_internal/integrations/pymongo.py

@@ -8,7 +8,7 @@
 try:
     from opentelemetry.instrumentation.pymongo import (
         PymongoInstrumentor,
-        dummy_callback,  # type: ignore[reportUnknownVariableType]
+        dummy_callback,
     )
 except ImportError:
     raise RuntimeError(

logfire/_internal/metrics.py

@@ -44,20 +44,15 @@ def get_meter(
         name: str,
         version: str | None = None,
         schema_url: str | None = None,
-        *args: Any,
-        **kwargs: Any,
+        attributes: Attributes | None = None,
     ) -> Meter:
         with self.lock:
             if name in self.suppressed_scopes:
                 provider = NoOpMeterProvider()
             else:
                 provider = self.provider
-            meter = _ProxyMeter(
-                provider.get_meter(name, version=version, schema_url=schema_url, *args, **kwargs),
-                name,
-                version,
-                schema_url,
-            )
+            inner_meter = provider.get_meter(name, version, schema_url, attributes)
+            meter = _ProxyMeter(inner_meter, name, version, schema_url)
             self.meters.add(meter)
             return meter
 
@@ -160,9 +155,12 @@ def create_histogram(
         name: str,
         unit: str = '',
         description: str = '',
+        **kwargs: Any,
     ) -> Histogram:
         with self._lock:
-            proxy = _ProxyHistogram(self._meter.create_histogram(name, unit, description), name, unit, description)
+            proxy = _ProxyHistogram(
+                self._meter.create_histogram(name, unit, description, **kwargs), name, unit, description
+            )
             self._instruments.add(proxy)
             return proxy
 

logfire/_internal/tracer.py

@@ -137,7 +137,7 @@ def end(self, end_time: int | None = None) -> None:
     def get_span_context(self) -> SpanContext:
         return self.span.get_span_context()
 
-    def set_attributes(self, attributes: dict[str, otel_types.AttributeValue]) -> None:
+    def set_attributes(self, attributes: Mapping[str, otel_types.AttributeValue]) -> None:
         self.span.set_attributes(attributes)
 
     def set_attribute(self, key: str, value: otel_types.AttributeValue) -> None:

logfire/integrations/wsgi.py

@@ -7,7 +7,7 @@
 if TYPE_CHECKING:
     from wsgiref.types import WSGIEnvironment
 
-ResponseHook = Callable[[Span, 'WSGIEnvironment', int, 'list[tuple[str, str]]'], None]
+ResponseHook = Callable[[Span, 'WSGIEnvironment', str, 'list[tuple[str, str]]'], None]
 """A callback called when a response is sent by the server."""
 
 RequestHook = Callable[[Span, 'WSGIEnvironment'], None]

pyproject.toml

@@ -46,8 +46,8 @@ classifiers = [
     "Framework :: OpenTelemetry :: Instrumentations",
 ]
 dependencies = [
-    "opentelemetry-sdk >= 1.21.0",
-    "opentelemetry-exporter-otlp-proto-http >= 1.21.0",
+    "opentelemetry-sdk >= 1.26.0, < 1.31.0",
+    "opentelemetry-exporter-otlp-proto-http >= 1.26.0, < 1.31.0",
     "opentelemetry-instrumentation >= 0.41b0",
     "rich >= 13.4.2",
     "protobuf >= 4.23.4",

tests/otel_integrations/test_aws_lambda.py

@@ -23,6 +23,9 @@ def lambda_handler(event: Any, context: MockLambdaContext):
     pass
 
 
+HANDLER_NAME = f'{__name__}.{lambda_handler.__name__}'
+
+
 # The below mock is based on the following code:
 # https://github.com/open-telemetry/opentelemetry-python-contrib/blob/ecf5529f99222e7d945eddcaa83acb8a47c9ba42/instrumentation/opentelemetry-instrumentation-aws-lambda/tests/test_aws_lambda_instrumentation_manual.py#L57-L66
 @dataclass
@@ -39,7 +42,7 @@ def test_instrument_aws_lambda(exporter: TestExporter) -> None:
     with logfire.span('span'):
         current_context = get_context()
 
-    with mock.patch.dict('os.environ', {_HANDLER: 'tests.otel_integrations.test_aws_lambda.lambda_handler'}):
+    with mock.patch.dict('os.environ', {_HANDLER: HANDLER_NAME, 'AWS_LAMBDA_FUNCTION_NAME': HANDLER_NAME}):
         logfire.instrument_aws_lambda(lambda_handler, event_context_extractor=event_context_extractor)
 
         context = MockLambdaContext(
@@ -66,14 +69,14 @@ def test_instrument_aws_lambda(exporter: TestExporter) -> None:
                 },
             },
             {
-                'name': 'tests.otel_integrations.test_aws_lambda.lambda_handler',
+                'name': HANDLER_NAME,
                 'context': {'trace_id': 1, 'span_id': 3, 'is_remote': False},
                 'parent': {'trace_id': 1, 'span_id': 1, 'is_remote': True},
                 'start_time': 3000000000,
                 'end_time': 4000000000,
                 'attributes': {
                     'logfire.span_type': 'span',
-                    'logfire.msg': 'tests.otel_integrations.test_aws_lambda.lambda_handler',
+                    'logfire.msg': HANDLER_NAME,
                     'cloud.resource_id': 'arn:aws:lambda:us-east-1:123456:function:myfunction:myalias',
                     'faas.invocation_id': 'mock_aws_request_id',
                     'cloud.account.id': '123456',

tests/otel_integrations/test_mysql.py

@@ -115,8 +115,8 @@ def test_instrument_mysql_connection(exporter: TestExporter, mysql_container: My
         )
 
         conn = MySQLInstrumentor().uninstrument_connection(conn)  # type: ignore
-        with conn.cursor() as cursor:  # type: ignore
-            cursor.execute('INSERT INTO test (id, name) VALUES (2, "test-2")')  # type: ignore
+        with conn.cursor() as cursor:
+            cursor.execute('INSERT INTO test (id, name) VALUES (2, "test-2")')
 
         assert len(exporter.exported_spans_as_dict()) == 1
 

tests/otel_integrations/test_psycopg.py

@@ -13,13 +13,12 @@
 
 
 def test_check_version():
-    assert check_version('psycopg2', '2.7.3.1', Psycopg2Instrumentor())
-    assert not check_version('psycopg2', '2.7.3.0', Psycopg2Instrumentor())
+    assert check_version('psycopg2-binary', '2.7.3.1', Psycopg2Instrumentor())
+    assert not check_version('psycopg2-binary', '2.7.3.0', Psycopg2Instrumentor())
     assert check_version('psycopg', '3.1.0', PsycopgInstrumentor())
     assert not check_version('psycopg', '3.0.1', PsycopgInstrumentor())
 
     assert check_version(psycopg.__name__, psycopg.__version__, PsycopgInstrumentor())
-    assert check_version(psycopg2.__name__, psycopg2.__version__, Psycopg2Instrumentor())  # type: ignore
 
 
 def test_instrument_psycopg():