Skip to content

Commit fa81a68

Browse files
Bump azure-monitor-opentelemetry from 1.6.1 to 1.6.13 (#2663)
* Bump azure-monitor-opentelemetry from 1.6.1 to 1.6.13 Bumps [azure-monitor-opentelemetry](https://github.com/Azure/azure-sdk-for-python) from 1.6.1 to 1.6.13. - [Release notes](https://github.com/Azure/azure-sdk-for-python/releases) - [Changelog](https://github.com/Azure/azure-sdk-for-python/blob/main/doc/esrp_release.md) - [Commits](Azure/azure-sdk-for-python@azure-monitor-opentelemetry_1.6.1...azure-monitor-opentelemetry_1.6.13) --- updated-dependencies: - dependency-name: azure-monitor-opentelemetry dependency-version: 1.6.13 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Update other versions in tandem * Disable unneeded opentelemetry instrumentations since psycopg2 has an error anyway * Add test that calls configure_azure_monitor --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pamela Fox <[email protected]> Co-authored-by: Pamela Fox <[email protected]>
1 parent d540a6e commit fa81a68

File tree

3 files changed

+32
-20
lines changed

3 files changed

+32
-20
lines changed

app/backend/app.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,13 @@ def create_app():
809809

810810
if os.getenv("APPLICATIONINSIGHTS_CONNECTION_STRING"):
811811
app.logger.info("APPLICATIONINSIGHTS_CONNECTION_STRING is set, enabling Azure Monitor")
812-
configure_azure_monitor()
812+
configure_azure_monitor(
813+
instrumentation_options={
814+
"django": {"enabled": False},
815+
"psycopg2": {"enabled": False},
816+
"fastapi": {"enabled": False},
817+
}
818+
)
813819
# This tracks HTTP requests made by aiohttp:
814820
AioHttpClientInstrumentor().instrument()
815821
# This tracks HTTP requests made by httpx:

app/backend/requirements.txt

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ azure-identity==1.17.1
5151
# via
5252
# -r requirements.in
5353
# msgraph-sdk
54-
azure-monitor-opentelemetry==1.6.1
54+
azure-monitor-opentelemetry==1.6.13
5555
# via -r requirements.in
56-
azure-monitor-opentelemetry-exporter==1.0.0b32
56+
azure-monitor-opentelemetry-exporter==1.0.0b40
5757
# via azure-monitor-opentelemetry
5858
azure-search-documents==11.6.0b12
5959
# via -r requirements.in
@@ -214,7 +214,7 @@ oauthlib==3.2.2
214214
# via requests-oauthlib
215215
openai==1.99.8
216216
# via -r requirements.in
217-
opentelemetry-api==1.31.1
217+
opentelemetry-api==1.36.0
218218
# via
219219
# azure-core-tracing-opentelemetry
220220
# azure-monitor-opentelemetry-exporter
@@ -237,7 +237,7 @@ opentelemetry-api==1.31.1
237237
# opentelemetry-instrumentation-wsgi
238238
# opentelemetry-sdk
239239
# opentelemetry-semantic-conventions
240-
opentelemetry-instrumentation==0.52b1
240+
opentelemetry-instrumentation==0.57b0
241241
# via
242242
# opentelemetry-instrumentation-aiohttp-client
243243
# opentelemetry-instrumentation-asgi
@@ -252,47 +252,47 @@ opentelemetry-instrumentation==0.52b1
252252
# opentelemetry-instrumentation-urllib
253253
# opentelemetry-instrumentation-urllib3
254254
# opentelemetry-instrumentation-wsgi
255-
opentelemetry-instrumentation-aiohttp-client==0.52b1
255+
opentelemetry-instrumentation-aiohttp-client==0.57b0
256256
# via -r requirements.in
257-
opentelemetry-instrumentation-asgi==0.52b1
257+
opentelemetry-instrumentation-asgi==0.57b0
258258
# via
259259
# -r requirements.in
260260
# opentelemetry-instrumentation-fastapi
261-
opentelemetry-instrumentation-dbapi==0.52b1
261+
opentelemetry-instrumentation-dbapi==0.57b0
262262
# via opentelemetry-instrumentation-psycopg2
263-
opentelemetry-instrumentation-django==0.52b1
263+
opentelemetry-instrumentation-django==0.57b0
264264
# via azure-monitor-opentelemetry
265-
opentelemetry-instrumentation-fastapi==0.52b1
265+
opentelemetry-instrumentation-fastapi==0.57b0
266266
# via azure-monitor-opentelemetry
267-
opentelemetry-instrumentation-flask==0.52b1
267+
opentelemetry-instrumentation-flask==0.57b0
268268
# via azure-monitor-opentelemetry
269-
opentelemetry-instrumentation-httpx==0.52b1
269+
opentelemetry-instrumentation-httpx==0.57b0
270270
# via -r requirements.in
271271
opentelemetry-instrumentation-openai==0.39.0
272272
# via -r requirements.in
273-
opentelemetry-instrumentation-psycopg2==0.52b1
273+
opentelemetry-instrumentation-psycopg2==0.57b0
274274
# via azure-monitor-opentelemetry
275-
opentelemetry-instrumentation-requests==0.52b1
275+
opentelemetry-instrumentation-requests==0.57b0
276276
# via azure-monitor-opentelemetry
277-
opentelemetry-instrumentation-urllib==0.52b1
277+
opentelemetry-instrumentation-urllib==0.57b0
278278
# via azure-monitor-opentelemetry
279-
opentelemetry-instrumentation-urllib3==0.52b1
279+
opentelemetry-instrumentation-urllib3==0.57b0
280280
# via azure-monitor-opentelemetry
281-
opentelemetry-instrumentation-wsgi==0.52b1
281+
opentelemetry-instrumentation-wsgi==0.57b0
282282
# via
283283
# opentelemetry-instrumentation-django
284284
# opentelemetry-instrumentation-flask
285285
opentelemetry-resource-detector-azure==0.1.5
286286
# via azure-monitor-opentelemetry
287-
opentelemetry-sdk==1.31.1
287+
opentelemetry-sdk==1.36.0
288288
# via
289289
# azure-monitor-opentelemetry
290290
# azure-monitor-opentelemetry-exporter
291291
# microsoft-kiota-abstractions
292292
# microsoft-kiota-authentication-azure
293293
# microsoft-kiota-http
294294
# opentelemetry-resource-detector-azure
295-
opentelemetry-semantic-conventions==0.52b1
295+
opentelemetry-semantic-conventions==0.57b0
296296
# via
297297
# opentelemetry-instrumentation
298298
# opentelemetry-instrumentation-aiohttp-client
@@ -310,7 +310,7 @@ opentelemetry-semantic-conventions==0.52b1
310310
# opentelemetry-sdk
311311
opentelemetry-semantic-conventions-ai==0.4.3
312312
# via opentelemetry-instrumentation-openai
313-
opentelemetry-util-http==0.52b1
313+
opentelemetry-util-http==0.57b0
314314
# via
315315
# opentelemetry-instrumentation-aiohttp-client
316316
# opentelemetry-instrumentation-asgi

tests/test_app_config.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,3 +307,9 @@ async def test_app_config_for_reasoning_override_effort(monkeypatch, minimal_env
307307
assert result["streamingEnabled"] is True
308308
assert result["showReasoningEffortOption"] is True
309309
assert result["defaultReasoningEffort"] == "low"
310+
311+
312+
def test_app_enables_azure_monitor_when_connection_string_set(monkeypatch):
313+
mock_connection_string = "InstrumentationKey=12345678-1234-1234-1234-123456789012"
314+
monkeypatch.setenv("APPLICATIONINSIGHTS_CONNECTION_STRING", mock_connection_string)
315+
app.create_app()

0 commit comments

Comments
 (0)