flagsmith-common 3.9.0__tar.gz → 3.10.0__tar.gz

{flagsmith_common-3.9.0 → flagsmith_common-3.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flagsmith-common
-Version: 3.9.0
+Version: 3.10.0
 Summary: Flagsmith's common library
 Author: Matthew Elwell, Gagan Trivedi, Kim Gustyr, Zach Aysan, Francesco Lo Franco, Rodrigo López Dato, Evandro Myller, Wadii Zaim
 License-Expression: BSD-3-Clause
@@ -9,6 +9,7 @@ Classifier: Framework :: Django
 Classifier: Framework :: Pytest
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: BSD License
+Requires-Dist: flagsmith-common[otel] ; extra == 'common-core'
 Requires-Dist: django>4,<6 ; extra == 'common-core'
 Requires-Dist: django-health-check ; extra == 'common-core'
 Requires-Dist: djangorestframework-recursive ; extra == 'common-core'
@@ -17,10 +18,6 @@ Requires-Dist: drf-spectacular>=0.28.0,<1 ; extra == 'common-core'
 Requires-Dist: drf-writable-nested ; extra == 'common-core'
 Requires-Dist: environs<16 ; extra == 'common-core'
 Requires-Dist: gunicorn>=19.1 ; extra == 'common-core'
-Requires-Dist: inflection ; extra == 'common-core'
-Requires-Dist: opentelemetry-api>=1.25,<2 ; extra == 'common-core'
-Requires-Dist: opentelemetry-sdk>=1.25,<2 ; extra == 'common-core'
-Requires-Dist: opentelemetry-exporter-otlp-proto-http>=1.25,<2 ; extra == 'common-core'
 Requires-Dist: opentelemetry-instrumentation-django>=0.46b0,<1 ; extra == 'common-core'
 Requires-Dist: opentelemetry-instrumentation-psycopg2>=0.46b0,<1 ; extra == 'common-core'
 Requires-Dist: opentelemetry-instrumentation-redis>=0.46b0,<1 ; extra == 'common-core'
@@ -28,13 +25,17 @@ Requires-Dist: redis>=5,<6 ; extra == 'common-core'
 Requires-Dist: prometheus-client>=0.0.16 ; extra == 'common-core'
 Requires-Dist: psycopg2-binary>=2.9,<3 ; extra == 'common-core'
 Requires-Dist: requests ; extra == 'common-core'
-Requires-Dist: sentry-sdk>=2.0.0,<3.0.0 ; extra == 'common-core'
 Requires-Dist: simplejson>=3,<4 ; extra == 'common-core'
-Requires-Dist: structlog>=24.4,<26 ; extra == 'common-core'
-Requires-Dist: typing-extensions ; extra == 'common-core'
 Requires-Dist: simplejson ; extra == 'flagsmith-schemas'
 Requires-Dist: typing-extensions ; extra == 'flagsmith-schemas'
 Requires-Dist: flagsmith-flag-engine>6 ; extra == 'flagsmith-schemas'
+Requires-Dist: inflection ; extra == 'otel'
+Requires-Dist: opentelemetry-api>=1.25,<2 ; extra == 'otel'
+Requires-Dist: opentelemetry-sdk>=1.25,<2 ; extra == 'otel'
+Requires-Dist: opentelemetry-exporter-otlp-proto-http>=1.25,<2 ; extra == 'otel'
+Requires-Dist: sentry-sdk>=2.0.0,<3.0.0 ; extra == 'otel'
+Requires-Dist: structlog>=24.4,<26 ; extra == 'otel'
+Requires-Dist: typing-extensions ; extra == 'otel'
 Requires-Dist: backoff>=2.2.1,<3.0.0 ; extra == 'task-processor'
 Requires-Dist: django>4,<6 ; extra == 'task-processor'
 Requires-Dist: django-health-check ; extra == 'task-processor'
@@ -52,6 +53,7 @@ Project-URL: Issues, https://github.com/flagsmith/flagsmith-common/issues
 Project-URL: Repository, https://github.com/flagsmith/flagsmith-common
 Provides-Extra: common-core
 Provides-Extra: flagsmith-schemas
+Provides-Extra: otel
 Provides-Extra: task-processor
 Provides-Extra: test-tools
 Description-Content-Type: text/markdown

{flagsmith_common-3.9.0 → flagsmith_common-3.10.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "flagsmith-common"
-version = "3.9.0"
+version = "3.10.0"
 description = "Flagsmith's common library"
 requires-python = ">=3.11,<4.0"
 dependencies = []
@@ -8,6 +8,7 @@ optional-dependencies = { test-tools = [
     "pyfakefs (>=5,<6)",
     "pytest-django (>=4,<5)",
 ], common-core = [
+    "flagsmith-common[otel]",
     "django (>4,<6)",
     "django-health-check",
     "djangorestframework-recursive",
@@ -16,10 +17,6 @@ optional-dependencies = { test-tools = [
     "drf-writable-nested",
     "environs (<16)",
     "gunicorn (>=19.1)",
-    "inflection",
-    "opentelemetry-api (>=1.25,<2)",
-    "opentelemetry-sdk (>=1.25,<2)",
-    "opentelemetry-exporter-otlp-proto-http (>=1.25,<2)",
     "opentelemetry-instrumentation-django (>=0.46b0,<1)",
     "opentelemetry-instrumentation-psycopg2 (>=0.46b0,<1)",
     "opentelemetry-instrumentation-redis (>=0.46b0,<1)",
@@ -27,8 +24,13 @@ optional-dependencies = { test-tools = [
     "prometheus-client (>=0.0.16)",
     "psycopg2-binary (>=2.9,<3)",
     "requests",
-    "sentry-sdk (>=2.0.0,<3.0.0)",
     "simplejson (>=3,<4)",
+], otel = [
+    "inflection",
+    "opentelemetry-api (>=1.25,<2)",
+    "opentelemetry-sdk (>=1.25,<2)",
+    "opentelemetry-exporter-otlp-proto-http (>=1.25,<2)",
+    "sentry-sdk (>=2.0.0,<3.0.0)",
     "structlog (>=24.4,<26)",
     "typing_extensions",
 ], task-processor = [

{flagsmith_common-3.9.0 → flagsmith_common-3.10.0}/src/common/core/otel.py

@@ -17,9 +17,6 @@ from opentelemetry.exporter.otlp.proto.http._log_exporter import (
 from opentelemetry.exporter.otlp.proto.http.trace_exporter import (
     OTLPSpanExporter,
 )
-from opentelemetry.instrumentation.django import DjangoInstrumentor
-from opentelemetry.instrumentation.psycopg2 import Psycopg2Instrumentor
-from opentelemetry.instrumentation.redis import RedisInstrumentor
 from opentelemetry.propagate import set_global_textmap
 from opentelemetry.propagators.composite import CompositePropagator
 from opentelemetry.propagators.textmap import TextMapPropagator
@@ -195,6 +192,10 @@ def setup_tracing(
             (e.g. ``"health/liveness,health/readiness"``). If not provided,
             falls back to the ``OTEL_PYTHON_DJANGO_EXCLUDED_URLS`` env var.
     """
+    from opentelemetry.instrumentation.django import DjangoInstrumentor
+    from opentelemetry.instrumentation.psycopg2 import Psycopg2Instrumentor
+    from opentelemetry.instrumentation.redis import RedisInstrumentor
+
     trace.set_tracer_provider(tracer_provider)
 
     propagator: TextMapPropagator = CompositePropagator(

{flagsmith_common-3.9.0 → flagsmith_common-3.10.0}/src/common/test_tools/plugin.py

@@ -31,10 +31,17 @@ def assert_metric_impl() -> Generator[AssertMetricFixture, None, None]:
     registry = prometheus_client.REGISTRY
     collectors = [*registry._collector_to_names]
 
-    # Reset registry state
+    # Reset registry state. `MetricWrapperBase.clear()` is implemented for
+    # parent metrics (those declared with labels) — calling it on an
+    # unlabeled metric raises AttributeError because `_lock` is only set on
+    # parents. Reset unlabeled metrics' observable state via `_metric_init`.
     for collector in collectors:
-        if isinstance(collector, prometheus_client.metrics.MetricWrapperBase):
+        if not isinstance(collector, prometheus_client.metrics.MetricWrapperBase):
+            continue
+        if collector._is_parent():  # type: ignore[no-untyped-call]
             collector.clear()
+        else:
+            collector._metric_init()  # type: ignore[no-untyped-call]
 
     def _assert_metric(
         *,