Skip to content

Commit c7c8469

Browse files
bisgaard-itisbisgaard-itis
committed
remove asyncpg and aiopg instrumentation
1 parent 0f685de commit c7c8469

File tree

17 files changed

+171
-245
lines changed

17 files changed

+171
-245
lines changed

‎packages/notifications-library/requirements/_base.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,16 @@ mdurl==0.1.2
6868
# via markdown-it-py
6969
multidict==6.1.0
7070
# via yarl
71-
opentelemetry-api==1.30.0
71+
opentelemetry-api==1.32.1
7272
# via
7373
# opentelemetry-instrumentation
7474
# opentelemetry-instrumentation-asyncpg
7575
# opentelemetry-semantic-conventions
76-
opentelemetry-instrumentation==0.51b0
76+
opentelemetry-instrumentation==0.53b1
7777
# via opentelemetry-instrumentation-asyncpg
78-
opentelemetry-instrumentation-asyncpg==0.51b0
78+
opentelemetry-instrumentation-asyncpg==0.53b1
7979
# via -r requirements/../../../packages/postgres-database/requirements/_base.in
80-
opentelemetry-semantic-conventions==0.51b0
80+
opentelemetry-semantic-conventions==0.53b1
8181
# via
8282
# opentelemetry-instrumentation
8383
# opentelemetry-instrumentation-asyncpg

‎packages/postgres-database/requirements/_base.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ markupsafe==3.0.2
2323
# via mako
2424
multidict==6.1.0
2525
# via yarl
26-
opentelemetry-api==1.30.0
26+
opentelemetry-api==1.32.1
2727
# via
2828
# opentelemetry-instrumentation
2929
# opentelemetry-instrumentation-asyncpg
3030
# opentelemetry-semantic-conventions
31-
opentelemetry-instrumentation==0.51b0
31+
opentelemetry-instrumentation==0.53b1
3232
# via opentelemetry-instrumentation-asyncpg
33-
opentelemetry-instrumentation-asyncpg==0.51b0
33+
opentelemetry-instrumentation-asyncpg==0.53b1
3434
# via -r requirements/_base.in
35-
opentelemetry-semantic-conventions==0.51b0
35+
opentelemetry-semantic-conventions==0.53b1
3636
# via
3737
# opentelemetry-instrumentation
3838
# opentelemetry-instrumentation-asyncpg

‎packages/service-library/requirements/_aiohttp.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,5 @@ attrs
1111
jsonschema
1212
opentelemetry-instrumentation-aiohttp-client
1313
opentelemetry-instrumentation-aiohttp-server
14-
opentelemetry-instrumentation-aiopg
1514
prometheus_client
1615
werkzeug

‎packages/service-library/requirements/_aiohttp.txt‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,29 +50,20 @@ opentelemetry-api==1.30.0
5050
# opentelemetry-instrumentation
5151
# opentelemetry-instrumentation-aiohttp-client
5252
# opentelemetry-instrumentation-aiohttp-server
53-
# opentelemetry-instrumentation-aiopg
54-
# opentelemetry-instrumentation-dbapi
5553
# opentelemetry-semantic-conventions
5654
opentelemetry-instrumentation==0.51b0
5755
# via
5856
# opentelemetry-instrumentation-aiohttp-client
5957
# opentelemetry-instrumentation-aiohttp-server
60-
# opentelemetry-instrumentation-aiopg
61-
# opentelemetry-instrumentation-dbapi
6258
opentelemetry-instrumentation-aiohttp-client==0.51b0
6359
# via -r requirements/_aiohttp.in
6460
opentelemetry-instrumentation-aiohttp-server==0.51b0
6561
# via -r requirements/_aiohttp.in
66-
opentelemetry-instrumentation-aiopg==0.51b0
67-
# via -r requirements/_aiohttp.in
68-
opentelemetry-instrumentation-dbapi==0.51b0
69-
# via opentelemetry-instrumentation-aiopg
7062
opentelemetry-semantic-conventions==0.51b0
7163
# via
7264
# opentelemetry-instrumentation
7365
# opentelemetry-instrumentation-aiohttp-client
7466
# opentelemetry-instrumentation-aiohttp-server
75-
# opentelemetry-instrumentation-dbapi
7667
opentelemetry-util-http==0.51b0
7768
# via
7869
# opentelemetry-instrumentation-aiohttp-client
@@ -120,8 +111,6 @@ wrapt==1.17.2
120111
# opentelemetry-instrumentation
121112
# opentelemetry-instrumentation-aiohttp-client
122113
# opentelemetry-instrumentation-aiohttp-server
123-
# opentelemetry-instrumentation-aiopg
124-
# opentelemetry-instrumentation-dbapi
125114
yarl==1.18.3
126115
# via aiohttp
127116
zipp==3.21.0

‎packages/service-library/src/servicelib/aiohttp/tracing.py‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@
2929
HAS_BOTOCORE = True
3030
except ImportError:
3131
HAS_BOTOCORE = False
32-
try:
33-
from opentelemetry.instrumentation.aiopg import AiopgInstrumentor
34-
35-
HAS_AIOPG = True
36-
except ImportError:
37-
HAS_AIOPG = False
3832
try:
3933
from opentelemetry.instrumentation.requests import RequestsInstrumentor
4034

@@ -114,13 +108,7 @@ def setup_tracing(
114108

115109
# Instrument aiohttp client
116110
AioHttpClientInstrumentor().instrument()
117-
if HAS_AIOPG:
118-
with log_context(
119-
_logger,
120-
logging.INFO,
121-
msg="Attempting to add aio-pg opentelemetry autoinstrumentation...",
122-
):
123-
AiopgInstrumentor().instrument()
111+
124112
if HAS_BOTOCORE:
125113
with log_context(
126114
_logger,

‎packages/service-library/src/servicelib/fastapi/tracing.py‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,6 @@
2020
_logger = logging.getLogger(__name__)
2121

2222
try:
23-
from opentelemetry.instrumentation.asyncpg import ( # type: ignore[import-not-found]
24-
AsyncPGInstrumentor,
25-
)
26-
27-
HAS_ASYNCPG = True
28-
except ImportError:
29-
HAS_ASYNCPG = False
30-
31-
try:
32-
from opentelemetry.instrumentation.aiopg import AiopgInstrumentor
3323

3424
HAS_AIOPG = True
3525
except ImportError:
@@ -103,27 +93,13 @@ def initialize_tracing(
10393
# Instrument FastAPI
10494
FastAPIInstrumentor().instrument_app(app)
10595

106-
if HAS_AIOPG:
107-
with log_context(
108-
_logger,
109-
logging.INFO,
110-
msg="Attempting to add asyncpg opentelemetry autoinstrumentation...",
111-
):
112-
AiopgInstrumentor().instrument()
11396
if HAS_AIOPIKA_INSTRUMENTOR:
11497
with log_context(
11598
_logger,
11699
logging.INFO,
117100
msg="Attempting to add aio_pika opentelemetry autoinstrumentation...",
118101
):
119102
AioPikaInstrumentor().instrument()
120-
if HAS_ASYNCPG:
121-
with log_context(
122-
_logger,
123-
logging.INFO,
124-
msg="Attempting to add asyncpg opentelemetry autoinstrumentation...",
125-
):
126-
AsyncPGInstrumentor().instrument()
127103
if HAS_REDIS:
128104
with log_context(
129105
_logger,

‎packages/service-library/tests/conftest.py‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -127,18 +127,6 @@ def uninstrument_opentelemetry():
127127
RequestsInstrumentor().uninstrument()
128128
except ImportError:
129129
pass
130-
try:
131-
from opentelemetry.instrumentation.aiopg import AiopgInstrumentor
132-
133-
AiopgInstrumentor().uninstrument()
134-
except ImportError:
135-
pass
136-
try:
137-
from opentelemetry.instrumentation.asyncpg import AsyncPGInstrumentor
138-
139-
AsyncPGInstrumentor().uninstrument()
140-
except ImportError:
141-
pass
142130
try:
143131
from opentelemetry.instrumentation.fastapi import FastAPIInstrumentor
144132

‎packages/simcore-sdk/requirements/_base.txt‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ multidict==6.1.0
150150
# via
151151
# aiohttp
152152
# yarl
153-
opentelemetry-api==1.30.0
153+
opentelemetry-api==1.32.1
154154
# via
155155
# -r requirements/../../../packages/service-library/requirements/_base.in
156156
# opentelemetry-exporter-otlp-proto-grpc
@@ -163,51 +163,51 @@ opentelemetry-api==1.30.0
163163
# opentelemetry-instrumentation-requests
164164
# opentelemetry-sdk
165165
# opentelemetry-semantic-conventions
166-
opentelemetry-exporter-otlp==1.30.0
166+
opentelemetry-exporter-otlp==1.32.1
167167
# via -r requirements/../../../packages/service-library/requirements/_base.in
168-
opentelemetry-exporter-otlp-proto-common==1.30.0
168+
opentelemetry-exporter-otlp-proto-common==1.32.1
169169
# via
170170
# opentelemetry-exporter-otlp-proto-grpc
171171
# opentelemetry-exporter-otlp-proto-http
172-
opentelemetry-exporter-otlp-proto-grpc==1.30.0
172+
opentelemetry-exporter-otlp-proto-grpc==1.32.1
173173
# via opentelemetry-exporter-otlp
174-
opentelemetry-exporter-otlp-proto-http==1.30.0
174+
opentelemetry-exporter-otlp-proto-http==1.32.1
175175
# via opentelemetry-exporter-otlp
176-
opentelemetry-instrumentation==0.51b0
176+
opentelemetry-instrumentation==0.53b1
177177
# via
178178
# opentelemetry-instrumentation-aio-pika
179179
# opentelemetry-instrumentation-asyncpg
180180
# opentelemetry-instrumentation-logging
181181
# opentelemetry-instrumentation-redis
182182
# opentelemetry-instrumentation-requests
183-
opentelemetry-instrumentation-aio-pika==0.51b0
183+
opentelemetry-instrumentation-aio-pika==0.53b1
184184
# via -r requirements/../../../packages/service-library/requirements/_base.in
185-
opentelemetry-instrumentation-asyncpg==0.51b0
185+
opentelemetry-instrumentation-asyncpg==0.53b1
186186
# via -r requirements/../../../packages/postgres-database/requirements/_base.in
187-
opentelemetry-instrumentation-logging==0.51b0
187+
opentelemetry-instrumentation-logging==0.53b1
188188
# via -r requirements/../../../packages/service-library/requirements/_base.in
189-
opentelemetry-instrumentation-redis==0.51b0
189+
opentelemetry-instrumentation-redis==0.53b1
190190
# via -r requirements/../../../packages/service-library/requirements/_base.in
191-
opentelemetry-instrumentation-requests==0.51b0
191+
opentelemetry-instrumentation-requests==0.53b1
192192
# via -r requirements/../../../packages/service-library/requirements/_base.in
193-
opentelemetry-proto==1.30.0
193+
opentelemetry-proto==1.32.1
194194
# via
195195
# opentelemetry-exporter-otlp-proto-common
196196
# opentelemetry-exporter-otlp-proto-grpc
197197
# opentelemetry-exporter-otlp-proto-http
198-
opentelemetry-sdk==1.30.0
198+
opentelemetry-sdk==1.32.1
199199
# via
200200
# -r requirements/../../../packages/service-library/requirements/_base.in
201201
# opentelemetry-exporter-otlp-proto-grpc
202202
# opentelemetry-exporter-otlp-proto-http
203-
opentelemetry-semantic-conventions==0.51b0
203+
opentelemetry-semantic-conventions==0.53b1
204204
# via
205205
# opentelemetry-instrumentation
206206
# opentelemetry-instrumentation-asyncpg
207207
# opentelemetry-instrumentation-redis
208208
# opentelemetry-instrumentation-requests
209209
# opentelemetry-sdk
210-
opentelemetry-util-http==0.51b0
210+
opentelemetry-util-http==0.53b1
211211
# via opentelemetry-instrumentation-requests
212212
orjson==3.10.15
213213
# via

‎services/api-server/requirements/_base.txt‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ multidict==6.1.0
341341
# via
342342
# aiohttp
343343
# yarl
344-
opentelemetry-api==1.28.2
344+
opentelemetry-api==1.32.1
345345
# via
346346
# -r requirements/../../../packages/service-library/requirements/_base.in
347347
# -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
@@ -358,19 +358,19 @@ opentelemetry-api==1.28.2
358358
# opentelemetry-instrumentation-requests
359359
# opentelemetry-sdk
360360
# opentelemetry-semantic-conventions
361-
opentelemetry-exporter-otlp==1.28.2
361+
opentelemetry-exporter-otlp==1.32.1
362362
# via
363363
# -r requirements/../../../packages/service-library/requirements/_base.in
364364
# -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
365-
opentelemetry-exporter-otlp-proto-common==1.28.2
365+
opentelemetry-exporter-otlp-proto-common==1.32.1
366366
# via
367367
# opentelemetry-exporter-otlp-proto-grpc
368368
# opentelemetry-exporter-otlp-proto-http
369-
opentelemetry-exporter-otlp-proto-grpc==1.28.2
369+
opentelemetry-exporter-otlp-proto-grpc==1.32.1
370370
# via opentelemetry-exporter-otlp
371-
opentelemetry-exporter-otlp-proto-http==1.28.2
371+
opentelemetry-exporter-otlp-proto-http==1.32.1
372372
# via opentelemetry-exporter-otlp
373-
opentelemetry-instrumentation==0.49b2
373+
opentelemetry-instrumentation==0.53b1
374374
# via
375375
# opentelemetry-instrumentation-aio-pika
376376
# opentelemetry-instrumentation-asgi
@@ -380,44 +380,44 @@ opentelemetry-instrumentation==0.49b2
380380
# opentelemetry-instrumentation-logging
381381
# opentelemetry-instrumentation-redis
382382
# opentelemetry-instrumentation-requests
383-
opentelemetry-instrumentation-aio-pika==0.49b2
383+
opentelemetry-instrumentation-aio-pika==0.53b1
384384
# via
385385
# -r requirements/../../../packages/service-library/requirements/_base.in
386386
# -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
387-
opentelemetry-instrumentation-asgi==0.49b2
387+
opentelemetry-instrumentation-asgi==0.53b1
388388
# via opentelemetry-instrumentation-fastapi
389-
opentelemetry-instrumentation-asyncpg==0.49b2
389+
opentelemetry-instrumentation-asyncpg==0.53b1
390390
# via
391391
# -r requirements/../../../packages/postgres-database/requirements/_base.in
392392
# -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in
393-
opentelemetry-instrumentation-fastapi==0.49b2
393+
opentelemetry-instrumentation-fastapi==0.53b1
394394
# via -r requirements/../../../packages/service-library/requirements/_fastapi.in
395-
opentelemetry-instrumentation-httpx==0.49b2
395+
opentelemetry-instrumentation-httpx==0.53b1
396396
# via -r requirements/../../../packages/service-library/requirements/_fastapi.in
397-
opentelemetry-instrumentation-logging==0.49b2
397+
opentelemetry-instrumentation-logging==0.53b1
398398
# via
399399
# -r requirements/../../../packages/service-library/requirements/_base.in
400400
# -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
401-
opentelemetry-instrumentation-redis==0.49b2
401+
opentelemetry-instrumentation-redis==0.53b1
402402
# via
403403
# -r requirements/../../../packages/service-library/requirements/_base.in
404404
# -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
405-
opentelemetry-instrumentation-requests==0.49b2
405+
opentelemetry-instrumentation-requests==0.53b1
406406
# via
407407
# -r requirements/../../../packages/service-library/requirements/_base.in
408408
# -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
409-
opentelemetry-proto==1.28.2
409+
opentelemetry-proto==1.32.1
410410
# via
411411
# opentelemetry-exporter-otlp-proto-common
412412
# opentelemetry-exporter-otlp-proto-grpc
413413
# opentelemetry-exporter-otlp-proto-http
414-
opentelemetry-sdk==1.28.2
414+
opentelemetry-sdk==1.32.1
415415
# via
416416
# -r requirements/../../../packages/service-library/requirements/_base.in
417417
# -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
418418
# opentelemetry-exporter-otlp-proto-grpc
419419
# opentelemetry-exporter-otlp-proto-http
420-
opentelemetry-semantic-conventions==0.49b2
420+
opentelemetry-semantic-conventions==0.53b1
421421
# via
422422
# opentelemetry-instrumentation
423423
# opentelemetry-instrumentation-asgi
@@ -427,7 +427,7 @@ opentelemetry-semantic-conventions==0.49b2
427427
# opentelemetry-instrumentation-redis
428428
# opentelemetry-instrumentation-requests
429429
# opentelemetry-sdk
430-
opentelemetry-util-http==0.49b2
430+
opentelemetry-util-http==0.53b1
431431
# via
432432
# opentelemetry-instrumentation-asgi
433433
# opentelemetry-instrumentation-fastapi

0 commit comments

Comments
 (0)