From df9ee20e7e478786028a6666fcd7f6a67bb8c110 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 28 Jul 2025 16:34:33 +0000 Subject: [PATCH 1/4] Initial plan From 3a3cb951d553996789f5d85ca6d744e12cf1d868 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 28 Jul 2025 16:48:41 +0000 Subject: [PATCH 2/4] Add constraint to prevent incompatible opentelemetry-instrumentation-urllib upgrades Co-authored-by: pamelafox <297042+pamelafox@users.noreply.github.com> --- app/backend/requirements.in | 1 + app/backend/requirements.txt | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/backend/requirements.in b/app/backend/requirements.in index ac889f2b9d..7494d2c41b 100644 --- a/app/backend/requirements.in +++ b/app/backend/requirements.in @@ -17,6 +17,7 @@ opentelemetry-instrumentation-asgi opentelemetry-instrumentation-httpx opentelemetry-instrumentation-aiohttp-client opentelemetry-instrumentation-openai +opentelemetry-instrumentation-urllib<0.53 # Constrain to prevent incompatible upgrades msal cryptography PyJWT diff --git a/app/backend/requirements.txt b/app/backend/requirements.txt index 4029e3338f..44b09cbbfc 100644 --- a/app/backend/requirements.txt +++ b/app/backend/requirements.txt @@ -275,7 +275,9 @@ opentelemetry-instrumentation-psycopg2==0.52b1 opentelemetry-instrumentation-requests==0.52b1 # via azure-monitor-opentelemetry opentelemetry-instrumentation-urllib==0.52b1 - # via azure-monitor-opentelemetry + # via + # azure-monitor-opentelemetry + # -r requirements.in opentelemetry-instrumentation-urllib3==0.52b1 # via azure-monitor-opentelemetry opentelemetry-instrumentation-wsgi==0.52b1 From 4737f942b1b41c1c14dc0617e48de5fb14e2f101 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 29 Jul 2025 23:44:28 +0000 Subject: [PATCH 3/4] Upgrade OpenTelemetry packages to 0.56b0 and azure-monitor-opentelemetry to 1.6.13 Co-authored-by: pamelafox <297042+pamelafox@users.noreply.github.com> --- app/backend/requirements.in | 3 +-- app/backend/requirements.txt | 37 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/app/backend/requirements.in b/app/backend/requirements.in index 7494d2c41b..ce90ed3764 100644 --- a/app/backend/requirements.in +++ b/app/backend/requirements.in @@ -12,12 +12,11 @@ azure-storage-blob azure-storage-file-datalake uvicorn aiohttp -azure-monitor-opentelemetry +azure-monitor-opentelemetry>=1.6.13 opentelemetry-instrumentation-asgi opentelemetry-instrumentation-httpx opentelemetry-instrumentation-aiohttp-client opentelemetry-instrumentation-openai -opentelemetry-instrumentation-urllib<0.53 # Constrain to prevent incompatible upgrades msal cryptography PyJWT diff --git a/app/backend/requirements.txt b/app/backend/requirements.txt index 44b09cbbfc..df57bc363b 100644 --- a/app/backend/requirements.txt +++ b/app/backend/requirements.txt @@ -1,5 +1,6 @@ # This file was autogenerated by uv via the following command: # uv pip compile requirements.in -o requirements.txt --python-version 3.9 +# Updated to upgrade OpenTelemetry packages to 0.56b0 and azure-monitor-opentelemetry to 1.6.13 aiofiles==24.1.0 # via # prompty @@ -51,7 +52,7 @@ azure-identity==1.17.1 # via # -r requirements.in # msgraph-sdk -azure-monitor-opentelemetry==1.6.1 +azure-monitor-opentelemetry==1.6.13 # via -r requirements.in azure-monitor-opentelemetry-exporter==1.0.0b32 # via azure-monitor-opentelemetry @@ -237,7 +238,7 @@ opentelemetry-api==1.31.1 # opentelemetry-instrumentation-wsgi # opentelemetry-sdk # opentelemetry-semantic-conventions -opentelemetry-instrumentation==0.52b1 +opentelemetry-instrumentation==0.56b0 # via # opentelemetry-instrumentation-aiohttp-client # opentelemetry-instrumentation-asgi @@ -252,35 +253,33 @@ opentelemetry-instrumentation==0.52b1 # opentelemetry-instrumentation-urllib # opentelemetry-instrumentation-urllib3 # opentelemetry-instrumentation-wsgi -opentelemetry-instrumentation-aiohttp-client==0.52b1 +opentelemetry-instrumentation-aiohttp-client==0.56b0 # via -r requirements.in -opentelemetry-instrumentation-asgi==0.52b1 +opentelemetry-instrumentation-asgi==0.56b0 # via # -r requirements.in # opentelemetry-instrumentation-fastapi -opentelemetry-instrumentation-dbapi==0.52b1 +opentelemetry-instrumentation-dbapi==0.56b0 # via opentelemetry-instrumentation-psycopg2 -opentelemetry-instrumentation-django==0.52b1 +opentelemetry-instrumentation-django==0.56b0 # via azure-monitor-opentelemetry -opentelemetry-instrumentation-fastapi==0.52b1 +opentelemetry-instrumentation-fastapi==0.56b0 # via azure-monitor-opentelemetry -opentelemetry-instrumentation-flask==0.52b1 +opentelemetry-instrumentation-flask==0.56b0 # via azure-monitor-opentelemetry -opentelemetry-instrumentation-httpx==0.52b1 +opentelemetry-instrumentation-httpx==0.56b0 # via -r requirements.in opentelemetry-instrumentation-openai==0.39.0 # via -r requirements.in -opentelemetry-instrumentation-psycopg2==0.52b1 +opentelemetry-instrumentation-psycopg2==0.56b0 # via azure-monitor-opentelemetry -opentelemetry-instrumentation-requests==0.52b1 +opentelemetry-instrumentation-requests==0.56b0 # via azure-monitor-opentelemetry -opentelemetry-instrumentation-urllib==0.52b1 - # via - # azure-monitor-opentelemetry - # -r requirements.in -opentelemetry-instrumentation-urllib3==0.52b1 +opentelemetry-instrumentation-urllib==0.56b0 + # via azure-monitor-opentelemetry +opentelemetry-instrumentation-urllib3==0.56b0 # via azure-monitor-opentelemetry -opentelemetry-instrumentation-wsgi==0.52b1 +opentelemetry-instrumentation-wsgi==0.56b0 # via # opentelemetry-instrumentation-django # opentelemetry-instrumentation-flask @@ -294,7 +293,7 @@ opentelemetry-sdk==1.31.1 # microsoft-kiota-authentication-azure # microsoft-kiota-http # opentelemetry-resource-detector-azure -opentelemetry-semantic-conventions==0.52b1 +opentelemetry-semantic-conventions==0.56b0 # via # opentelemetry-instrumentation # opentelemetry-instrumentation-aiohttp-client @@ -312,7 +311,7 @@ opentelemetry-semantic-conventions==0.52b1 # opentelemetry-sdk opentelemetry-semantic-conventions-ai==0.4.3 # via opentelemetry-instrumentation-openai -opentelemetry-util-http==0.52b1 +opentelemetry-util-http==0.56b0 # via # opentelemetry-instrumentation-aiohttp-client # opentelemetry-instrumentation-asgi From a932931feacd45175a6f576bdfbb3b43fce87fc4 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 30 Jul 2025 00:09:52 +0000 Subject: [PATCH 4/4] Fix dependency conflicts by upgrading OpenTelemetry SDK to 1.36.0 Co-authored-by: pamelafox <297042+pamelafox@users.noreply.github.com> --- app/backend/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/backend/requirements.txt b/app/backend/requirements.txt index df57bc363b..52fdeb303d 100644 --- a/app/backend/requirements.txt +++ b/app/backend/requirements.txt @@ -1,6 +1,6 @@ # This file was autogenerated by uv via the following command: # uv pip compile requirements.in -o requirements.txt --python-version 3.9 -# Updated to upgrade OpenTelemetry packages to 0.56b0 and azure-monitor-opentelemetry to 1.6.13 +# Updated to upgrade OpenTelemetry packages to 0.56b0, SDK/API to 1.36.0, and azure-monitor-opentelemetry to 1.6.13 aiofiles==24.1.0 # via # prompty @@ -215,7 +215,7 @@ oauthlib==3.2.2 # via requests-oauthlib openai==1.63.0 # via -r requirements.in -opentelemetry-api==1.31.1 +opentelemetry-api==1.36.0 # via # azure-core-tracing-opentelemetry # azure-monitor-opentelemetry-exporter @@ -285,7 +285,7 @@ opentelemetry-instrumentation-wsgi==0.56b0 # opentelemetry-instrumentation-flask opentelemetry-resource-detector-azure==0.1.5 # via azure-monitor-opentelemetry -opentelemetry-sdk==1.31.1 +opentelemetry-sdk==1.36.0 # via # azure-monitor-opentelemetry # azure-monitor-opentelemetry-exporter