Bump reasoner pydantic version

requirements-lock.txt

@@ -1,49 +1,49 @@
 aiostream==0.6.1
 anyio==4.4.0
 asgiref==3.8.1
-async-timeout==4.0.3
 bmt-lite-v3.1.0==2.2.2
-certifi==2024.6.2
+certifi==2024.7.4
 click==8.1.7
 Deprecated==1.2.14
 dnspython==2.6.1
 email_validator==2.2.0
 fastapi==0.111.0
-fastapi-cli==0.0.4
-googleapis-common-protos==1.56.2
-grpcio==1.64.1
+fastapi-cli==0.0.5
+googleapis-common-protos==1.59.1
+grpcio==1.66.0
 gunicorn==22.0.0
 h11==0.14.0
 httpcore==1.0.5
 httptools==0.6.1
 httpx==0.27.0
 idna==3.7
+importlib_metadata==8.0.0
 Jinja2==3.1.4
 kp-registry==4.0.1
 markdown-it-py==3.0.0
 MarkupSafe==2.1.5
 mdurl==0.1.2
-opentelemetry-api==1.16.0
-opentelemetry-exporter-jaeger==1.16.0
-opentelemetry-exporter-jaeger-proto-grpc==1.16.0
-opentelemetry-exporter-jaeger-thrift==1.16.0
-opentelemetry-instrumentation==0.37b0
-opentelemetry-instrumentation-asgi==0.37b0
-opentelemetry-instrumentation-fastapi==0.37b0
-opentelemetry-instrumentation-httpx==0.37b0
-opentelemetry-sdk==1.16.0
-opentelemetry-semantic-conventions==0.37b0
-opentelemetry-util-http==0.37b0
+opentelemetry-api==1.26.0
+opentelemetry-exporter-jaeger==1.21.0
+opentelemetry-exporter-jaeger-proto-grpc==1.21.0
+opentelemetry-exporter-jaeger-thrift==1.21.0
+opentelemetry-instrumentation==0.47b0
+opentelemetry-instrumentation-asgi==0.47b0
+opentelemetry-instrumentation-fastapi==0.47b0
+opentelemetry-instrumentation-httpx==0.47b0
+opentelemetry-sdk==1.26.0
+opentelemetry-semantic-conventions==0.47b0
+opentelemetry-util-http==0.47b0
 orjson==3.10.3
 packaging==24.1
-protobuf==3.20.3
-pydantic==1.10.17
+protobuf==4.25.4
+pydantic==1.10.18
 Pygments==2.18.0
 pyinstrument==4.6.2
 python-dotenv==1.0.1
 python-multipart==0.0.9
 PyYAML==6.0.1
-reasoner-pydantic==5.0.4
+reasoner-pydantic==5.0.6
 redis==5.0.6
 rich==13.7.1
 setuptools==70.0.0
@@ -52,12 +52,13 @@ six==1.16.0
 sniffio==1.3.1
 starlette==0.37.2
 thrift==0.20.0
-typer==0.12.3
+typer==0.12.4
 typing_extensions==4.12.2
 ujson==5.10.0
 uvicorn==0.29.0
-uvloop==0.19.0
-watchfiles==0.22.0
-websockets==12.0
+uvloop==0.20.0
+watchfiles==0.23.0
+websockets==13.0
 wheel==0.43.0
 wrapt==1.16.0
+zipp==3.20.0

requirements-test-lock.txt

@@ -1,6 +1,6 @@
 anyio==4.4.0
-certifi==2024.6.2
-coverage==7.5.4
+certifi==2024.7.4
+coverage==7.6.1
 fakeredis==2.23.2
 h11==0.14.0
 httpcore==1.0.5
@@ -14,7 +14,7 @@ pytest-asyncio==0.23.7
 pytest-cov==5.0.0
 pytest-httpx==0.30.0
 pytest-mock==3.14.0
-redis==5.0.6
+redis==5.0.8
 setuptools==70.0.0
 sniffio==1.3.1
 sortedcontainers==2.4.0

requirements.txt

@@ -7,13 +7,13 @@ httpx==0.27.0
 pyyaml==6.0.1
 uvicorn[standard]==0.29.0
 fastapi==0.111.0
-reasoner-pydantic==5.0.4
+reasoner-pydantic==5.0.6
 redis==5.0.6
 orjson==3.10.3
 gunicorn==22.0.0
 kp-registry==4.0.1
-opentelemetry-sdk==1.16.0
-opentelemetry-instrumentation-fastapi==0.37b0
-opentelemetry-exporter-jaeger==1.16.0
-opentelemetry-instrumentation-httpx==0.37b0
+opentelemetry-sdk==1.26.0
+opentelemetry-instrumentation-fastapi==0.47b0
+opentelemetry-exporter-jaeger==1.21.0
+opentelemetry-instrumentation-httpx==0.47b0
 pyinstrument==4.6.2

strider/server.py

@@ -74,7 +74,7 @@
     title="Strider",
     description=DESCRIPTION,
     docs_url=None,
-    version="4.8.1",
+    version="4.8.2",
     terms_of_service=(
         "http://robokop.renci.org:7055/tos"
         "?service_long=Strider"
@@ -155,7 +155,7 @@ async def catch_exceptions_middleware(request: Request, call_next):
     from opentelemetry import trace
     from opentelemetry.exporter.jaeger.thrift import JaegerExporter
     from opentelemetry.sdk.resources import (
-        SERVICE_NAME as telemetery_service_name_key,
+        SERVICE_NAME,
         Resource,
     )
     from opentelemetry.sdk.trace import TracerProvider
@@ -168,19 +168,17 @@ async def catch_exceptions_middleware(request: Request, call_next):
     logging.captureWarnings(capture=True)
     warnings.filterwarnings("ignore", category=ResourceWarning)
     service_name = os.environ.get("OTEL_SERVICE_NAME", "STRIDER")
-    trace.set_tracer_provider(
-        TracerProvider(
-            resource=Resource.create({telemetery_service_name_key: service_name})
-        )
-    )
     jaeger_exporter = JaegerExporter(
         agent_host_name=settings.jaeger_host,
         agent_port=int(settings.jaeger_port),
     )
-    trace.get_tracer_provider().add_span_processor(BatchSpanProcessor(jaeger_exporter))
-    tracer = trace.get_tracer(__name__)
+    resource = Resource(attributes={SERVICE_NAME: service_name})
+    provider = TracerProvider(resource=resource)
+    processor = BatchSpanProcessor(jaeger_exporter)
+    provider.add_span_processor(processor)
+    trace.set_tracer_provider(provider)
     FastAPIInstrumentor.instrument_app(
-        APP, tracer_provider=trace, excluded_urls="docs,openapi.json"
+        APP, tracer_provider=provider, excluded_urls="docs,openapi.json"
     )
     HTTPXClientInstrumentor().instrument()