Skip to content

Commit b1bd7e1

Browse files
mrnicegyu11mrnicegyu11
committed
WIP
1 parent c6775d7 commit b1bd7e1

File tree

14 files changed

+122
-90
lines changed

14 files changed

+122
-90
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
alembic
88
pydantic
99
sqlalchemy[postgresql_psycopg2binary,postgresql_asyncpg] # SEE extras in https://github.com/sqlalchemy/sqlalchemy/blob/main/setup.cfg#L43
10-
opentelemetry-instrumentation-aiopg
10+
opentelemetry-instrumentation-asyncpg
1111
yarl

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

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,14 @@ multidict==6.1.0
2525
opentelemetry-api==1.27.0
2626
# via
2727
# opentelemetry-instrumentation
28-
# opentelemetry-instrumentation-aiopg
29-
# opentelemetry-instrumentation-dbapi
28+
# opentelemetry-instrumentation-asyncpg
3029
# opentelemetry-semantic-conventions
3130
opentelemetry-instrumentation==0.48b0
32-
# via
33-
# opentelemetry-instrumentation-aiopg
34-
# opentelemetry-instrumentation-dbapi
35-
opentelemetry-instrumentation-aiopg==0.48b0
31+
# via opentelemetry-instrumentation-asyncpg
32+
opentelemetry-instrumentation-asyncpg==0.48b0
3633
# via -r requirements/_base.in
37-
opentelemetry-instrumentation-dbapi==0.48b0
38-
# via opentelemetry-instrumentation-aiopg
3934
opentelemetry-semantic-conventions==0.48b0
40-
# via opentelemetry-instrumentation-dbapi
35+
# via opentelemetry-instrumentation-asyncpg
4136
psycopg2-binary==2.9.9
4237
# via sqlalchemy
4338
pydantic==1.10.18
@@ -59,8 +54,6 @@ wrapt==1.16.0
5954
# via
6055
# deprecated
6156
# opentelemetry-instrumentation
62-
# opentelemetry-instrumentation-aiopg
63-
# opentelemetry-instrumentation-dbapi
6457
yarl==1.12.1
6558
# via -r requirements/_base.in
6659
zipp==3.20.2

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

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,25 @@
1818
log = logging.getLogger(__name__)
1919
#########
2020
try:
21-
from opentelemetry.instrumentation.aiopg import AsyncPGInstrumentor
21+
from opentelemetry.instrumentation.asyncpg import AsyncPGInstrumentor
2222

2323
HAS_ASYNCPG = True
2424
except ImportError:
2525
HAS_ASYNCPG = False
2626
#########
2727
try:
28-
from opentelemetry.instrumentation.asyncpg import AiopgInstrumentor
28+
from opentelemetry.instrumentation.aio_pika import AioPikaInstrumentor
2929

30-
HAS_AIPPG = True
30+
HAS_AIOPIKA = True
3131
except ImportError:
32-
HAS_AIPPG = False
32+
HAS_AIOPIKA = False
33+
#########
34+
try:
35+
from opentelemetry.instrumentation.aiopg import AiopgInstrumentor
36+
37+
HAS_AIOPG = True
38+
except ImportError:
39+
HAS_AIOPG = False
3340
#########
3441
try:
3542
from opentelemetry.instrumentation.redis import RedisInstrumentor
@@ -73,12 +80,15 @@ def setup_tracing(
7380
# Instrument FastAPI
7481
FastAPIInstrumentor().instrument_app(app)
7582

76-
if HAS_AIPPG:
83+
if HAS_AIOPG:
7784
log.info("Attempting to add aiopg opentelemetry autoinstrumentation...")
7885
AiopgInstrumentor().instrument()
7986
if HAS_ASYNCPG:
8087
log.info("Attempting to add asyncpg opentelemetry autoinstrumentation...")
8188
AsyncPGInstrumentor().instrument()
89+
if HAS_AIOPIKA:
90+
log.info("Attempting to add aio-pika opentelemetry autoinstrumentation...")
91+
AioPikaInstrumentor().instrument()
8292
if HAS_REDIS:
8393
log.info("Attempting to add redis opentelemetry autoinstrumentation...")
8494
RedisInstrumentor().instrument()

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ aiocache
1212
aiofiles
1313
aiohttp
1414
aiopg[sa]
15+
opentelemetry-instrumentation-aiopg
1516
packaging
1617
pint
1718
pydantic[email]

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

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,11 @@ opentelemetry-api==1.27.0
139139
# opentelemetry-exporter-otlp-proto-grpc
140140
# opentelemetry-exporter-otlp-proto-http
141141
# opentelemetry-instrumentation
142+
# opentelemetry-instrumentation-aio-pika
143+
# opentelemetry-instrumentation-aiopg
144+
# opentelemetry-instrumentation-asyncpg
145+
# opentelemetry-instrumentation-dbapi
146+
# opentelemetry-instrumentation-redis
142147
# opentelemetry-instrumentation-requests
143148
# opentelemetry-sdk
144149
# opentelemetry-semantic-conventions
@@ -153,7 +158,23 @@ opentelemetry-exporter-otlp-proto-grpc==1.27.0
153158
opentelemetry-exporter-otlp-proto-http==1.27.0
154159
# via opentelemetry-exporter-otlp
155160
opentelemetry-instrumentation==0.48b0
156-
# via opentelemetry-instrumentation-requests
161+
# via
162+
# opentelemetry-instrumentation-aio-pika
163+
# opentelemetry-instrumentation-aiopg
164+
# opentelemetry-instrumentation-asyncpg
165+
# opentelemetry-instrumentation-dbapi
166+
# opentelemetry-instrumentation-redis
167+
# opentelemetry-instrumentation-requests
168+
opentelemetry-instrumentation-aio-pika==0.48b0
169+
# via -r requirements/../../../packages/service-library/requirements/_base.in
170+
opentelemetry-instrumentation-aiopg==0.48b0
171+
# via -r requirements/_base.in
172+
opentelemetry-instrumentation-asyncpg==0.48b0
173+
# via -r requirements/../../../packages/postgres-database/requirements/_base.in
174+
opentelemetry-instrumentation-dbapi==0.48b0
175+
# via opentelemetry-instrumentation-aiopg
176+
opentelemetry-instrumentation-redis==0.48b0
177+
# via -r requirements/../../../packages/service-library/requirements/_base.in
157178
opentelemetry-instrumentation-requests==0.48b0
158179
# via -r requirements/../../../packages/service-library/requirements/_base.in
159180
opentelemetry-proto==1.27.0
@@ -168,6 +189,9 @@ opentelemetry-sdk==1.27.0
168189
# opentelemetry-exporter-otlp-proto-http
169190
opentelemetry-semantic-conventions==0.48b0
170191
# via
192+
# opentelemetry-instrumentation-asyncpg
193+
# opentelemetry-instrumentation-dbapi
194+
# opentelemetry-instrumentation-redis
171195
# opentelemetry-instrumentation-requests
172196
# opentelemetry-sdk
173197
opentelemetry-util-http==0.48b0
@@ -321,6 +345,10 @@ wrapt==1.16.0
321345
# via
322346
# deprecated
323347
# opentelemetry-instrumentation
348+
# opentelemetry-instrumentation-aio-pika
349+
# opentelemetry-instrumentation-aiopg
350+
# opentelemetry-instrumentation-dbapi
351+
# opentelemetry-instrumentation-redis
324352
yarl==1.12.1
325353
# via
326354
# -r requirements/../../../packages/postgres-database/requirements/_base.in

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ opentelemetry-api==1.27.0
280280
# opentelemetry-instrumentation-aio-pika
281281
# opentelemetry-instrumentation-aiopg
282282
# opentelemetry-instrumentation-asgi
283+
# opentelemetry-instrumentation-asyncpg
283284
# opentelemetry-instrumentation-dbapi
284285
# opentelemetry-instrumentation-fastapi
285286
# opentelemetry-instrumentation-redis
@@ -303,6 +304,7 @@ opentelemetry-instrumentation==0.48b0
303304
# opentelemetry-instrumentation-aio-pika
304305
# opentelemetry-instrumentation-aiopg
305306
# opentelemetry-instrumentation-asgi
307+
# opentelemetry-instrumentation-asyncpg
306308
# opentelemetry-instrumentation-dbapi
307309
# opentelemetry-instrumentation-fastapi
308310
# opentelemetry-instrumentation-redis
@@ -312,11 +314,13 @@ opentelemetry-instrumentation-aio-pika==0.48b0
312314
# -r requirements/../../../packages/service-library/requirements/_base.in
313315
# -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
314316
opentelemetry-instrumentation-aiopg==0.48b0
317+
# via -r requirements/../../../packages/simcore-sdk/requirements/_base.in
318+
opentelemetry-instrumentation-asgi==0.48b0
319+
# via opentelemetry-instrumentation-fastapi
320+
opentelemetry-instrumentation-asyncpg==0.48b0
315321
# via
316322
# -r requirements/../../../packages/postgres-database/requirements/_base.in
317323
# -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in
318-
opentelemetry-instrumentation-asgi==0.48b0
319-
# via opentelemetry-instrumentation-fastapi
320324
opentelemetry-instrumentation-dbapi==0.48b0
321325
# via opentelemetry-instrumentation-aiopg
322326
opentelemetry-instrumentation-fastapi==0.48b0
@@ -343,6 +347,7 @@ opentelemetry-sdk==1.27.0
343347
opentelemetry-semantic-conventions==0.48b0
344348
# via
345349
# opentelemetry-instrumentation-asgi
350+
# opentelemetry-instrumentation-asyncpg
346351
# opentelemetry-instrumentation-dbapi
347352
# opentelemetry-instrumentation-fastapi
348353
# opentelemetry-instrumentation-redis

‎services/catalog/requirements/_base.txt‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,8 @@ opentelemetry-api==1.27.0
187187
# opentelemetry-exporter-otlp-proto-http
188188
# opentelemetry-instrumentation
189189
# opentelemetry-instrumentation-aio-pika
190-
# opentelemetry-instrumentation-aiopg
191190
# opentelemetry-instrumentation-asgi
192-
# opentelemetry-instrumentation-dbapi
191+
# opentelemetry-instrumentation-asyncpg
193192
# opentelemetry-instrumentation-fastapi
194193
# opentelemetry-instrumentation-redis
195194
# opentelemetry-instrumentation-requests
@@ -208,20 +207,17 @@ opentelemetry-exporter-otlp-proto-http==1.27.0
208207
opentelemetry-instrumentation==0.48b0
209208
# via
210209
# opentelemetry-instrumentation-aio-pika
211-
# opentelemetry-instrumentation-aiopg
212210
# opentelemetry-instrumentation-asgi
213-
# opentelemetry-instrumentation-dbapi
211+
# opentelemetry-instrumentation-asyncpg
214212
# opentelemetry-instrumentation-fastapi
215213
# opentelemetry-instrumentation-redis
216214
# opentelemetry-instrumentation-requests
217215
opentelemetry-instrumentation-aio-pika==0.48b0
218216
# via -r requirements/../../../packages/service-library/requirements/_base.in
219-
opentelemetry-instrumentation-aiopg==0.48b0
220-
# via -r requirements/../../../packages/postgres-database/requirements/_base.in
221217
opentelemetry-instrumentation-asgi==0.48b0
222218
# via opentelemetry-instrumentation-fastapi
223-
opentelemetry-instrumentation-dbapi==0.48b0
224-
# via opentelemetry-instrumentation-aiopg
219+
opentelemetry-instrumentation-asyncpg==0.48b0
220+
# via -r requirements/../../../packages/postgres-database/requirements/_base.in
225221
opentelemetry-instrumentation-fastapi==0.48b0
226222
# via -r requirements/../../../packages/service-library/requirements/_fastapi.in
227223
opentelemetry-instrumentation-redis==0.48b0
@@ -241,7 +237,7 @@ opentelemetry-sdk==1.27.0
241237
opentelemetry-semantic-conventions==0.48b0
242238
# via
243239
# opentelemetry-instrumentation-asgi
244-
# opentelemetry-instrumentation-dbapi
240+
# opentelemetry-instrumentation-asyncpg
245241
# opentelemetry-instrumentation-fastapi
246242
# opentelemetry-instrumentation-redis
247243
# opentelemetry-instrumentation-requests
@@ -445,8 +441,6 @@ wrapt==1.16.0
445441
# deprecated
446442
# opentelemetry-instrumentation
447443
# opentelemetry-instrumentation-aio-pika
448-
# opentelemetry-instrumentation-aiopg
449-
# opentelemetry-instrumentation-dbapi
450444
# opentelemetry-instrumentation-redis
451445
yarl==1.9.4
452446
# via

‎services/director-v2/requirements/_base.txt‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,7 @@ opentelemetry-api==1.27.0
337337
# opentelemetry-instrumentation-aio-pika
338338
# opentelemetry-instrumentation-aiopg
339339
# opentelemetry-instrumentation-asgi
340+
# opentelemetry-instrumentation-asyncpg
340341
# opentelemetry-instrumentation-dbapi
341342
# opentelemetry-instrumentation-fastapi
342343
# opentelemetry-instrumentation-redis
@@ -360,6 +361,7 @@ opentelemetry-instrumentation==0.48b0
360361
# opentelemetry-instrumentation-aio-pika
361362
# opentelemetry-instrumentation-aiopg
362363
# opentelemetry-instrumentation-asgi
364+
# opentelemetry-instrumentation-asyncpg
363365
# opentelemetry-instrumentation-dbapi
364366
# opentelemetry-instrumentation-fastapi
365367
# opentelemetry-instrumentation-redis
@@ -369,11 +371,13 @@ opentelemetry-instrumentation-aio-pika==0.48b0
369371
# -r requirements/../../../packages/service-library/requirements/_base.in
370372
# -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
371373
opentelemetry-instrumentation-aiopg==0.48b0
374+
# via -r requirements/../../../packages/simcore-sdk/requirements/_base.in
375+
opentelemetry-instrumentation-asgi==0.48b0
376+
# via opentelemetry-instrumentation-fastapi
377+
opentelemetry-instrumentation-asyncpg==0.48b0
372378
# via
373379
# -r requirements/../../../packages/postgres-database/requirements/_base.in
374380
# -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in
375-
opentelemetry-instrumentation-asgi==0.48b0
376-
# via opentelemetry-instrumentation-fastapi
377381
opentelemetry-instrumentation-dbapi==0.48b0
378382
# via opentelemetry-instrumentation-aiopg
379383
opentelemetry-instrumentation-fastapi==0.48b0
@@ -400,6 +404,7 @@ opentelemetry-sdk==1.27.0
400404
opentelemetry-semantic-conventions==0.48b0
401405
# via
402406
# opentelemetry-instrumentation-asgi
407+
# opentelemetry-instrumentation-asyncpg
403408
# opentelemetry-instrumentation-dbapi
404409
# opentelemetry-instrumentation-fastapi
405410
# opentelemetry-instrumentation-redis

‎services/dynamic-scheduler/requirements/_base.txt‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,8 @@ opentelemetry-api==1.27.0
168168
# opentelemetry-exporter-otlp-proto-http
169169
# opentelemetry-instrumentation
170170
# opentelemetry-instrumentation-aio-pika
171-
# opentelemetry-instrumentation-aiopg
172171
# opentelemetry-instrumentation-asgi
173-
# opentelemetry-instrumentation-dbapi
172+
# opentelemetry-instrumentation-asyncpg
174173
# opentelemetry-instrumentation-fastapi
175174
# opentelemetry-instrumentation-redis
176175
# opentelemetry-instrumentation-requests
@@ -189,20 +188,17 @@ opentelemetry-exporter-otlp-proto-http==1.27.0
189188
opentelemetry-instrumentation==0.48b0
190189
# via
191190
# opentelemetry-instrumentation-aio-pika
192-
# opentelemetry-instrumentation-aiopg
193191
# opentelemetry-instrumentation-asgi
194-
# opentelemetry-instrumentation-dbapi
192+
# opentelemetry-instrumentation-asyncpg
195193
# opentelemetry-instrumentation-fastapi
196194
# opentelemetry-instrumentation-redis
197195
# opentelemetry-instrumentation-requests
198196
opentelemetry-instrumentation-aio-pika==0.48b0
199197
# via -r requirements/../../../packages/service-library/requirements/_base.in
200-
opentelemetry-instrumentation-aiopg==0.48b0
201-
# via -r requirements/../../../packages/postgres-database/requirements/_base.in
202198
opentelemetry-instrumentation-asgi==0.48b0
203199
# via opentelemetry-instrumentation-fastapi
204-
opentelemetry-instrumentation-dbapi==0.48b0
205-
# via opentelemetry-instrumentation-aiopg
200+
opentelemetry-instrumentation-asyncpg==0.48b0
201+
# via -r requirements/../../../packages/postgres-database/requirements/_base.in
206202
opentelemetry-instrumentation-fastapi==0.48b0
207203
# via -r requirements/../../../packages/service-library/requirements/_fastapi.in
208204
opentelemetry-instrumentation-redis==0.48b0
@@ -222,7 +218,7 @@ opentelemetry-sdk==1.27.0
222218
opentelemetry-semantic-conventions==0.48b0
223219
# via
224220
# opentelemetry-instrumentation-asgi
225-
# opentelemetry-instrumentation-dbapi
221+
# opentelemetry-instrumentation-asyncpg
226222
# opentelemetry-instrumentation-fastapi
227223
# opentelemetry-instrumentation-redis
228224
# opentelemetry-instrumentation-requests
@@ -412,8 +408,6 @@ wrapt==1.16.0
412408
# deprecated
413409
# opentelemetry-instrumentation
414410
# opentelemetry-instrumentation-aio-pika
415-
# opentelemetry-instrumentation-aiopg
416-
# opentelemetry-instrumentation-dbapi
417411
# opentelemetry-instrumentation-redis
418412
wsproto==1.2.0
419413
# via simple-websocket

‎services/dynamic-sidecar/requirements/_base.txt‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ opentelemetry-api==1.27.0
240240
# opentelemetry-instrumentation-aio-pika
241241
# opentelemetry-instrumentation-aiopg
242242
# opentelemetry-instrumentation-asgi
243+
# opentelemetry-instrumentation-asyncpg
243244
# opentelemetry-instrumentation-dbapi
244245
# opentelemetry-instrumentation-fastapi
245246
# opentelemetry-instrumentation-redis
@@ -263,6 +264,7 @@ opentelemetry-instrumentation==0.48b0
263264
# opentelemetry-instrumentation-aio-pika
264265
# opentelemetry-instrumentation-aiopg
265266
# opentelemetry-instrumentation-asgi
267+
# opentelemetry-instrumentation-asyncpg
266268
# opentelemetry-instrumentation-dbapi
267269
# opentelemetry-instrumentation-fastapi
268270
# opentelemetry-instrumentation-redis
@@ -272,11 +274,13 @@ opentelemetry-instrumentation-aio-pika==0.48b0
272274
# -r requirements/../../../packages/service-library/requirements/_base.in
273275
# -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
274276
opentelemetry-instrumentation-aiopg==0.48b0
277+
# via -r requirements/../../../packages/simcore-sdk/requirements/_base.in
278+
opentelemetry-instrumentation-asgi==0.48b0
279+
# via opentelemetry-instrumentation-fastapi
280+
opentelemetry-instrumentation-asyncpg==0.48b0
275281
# via
276282
# -r requirements/../../../packages/postgres-database/requirements/_base.in
277283
# -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in
278-
opentelemetry-instrumentation-asgi==0.48b0
279-
# via opentelemetry-instrumentation-fastapi
280284
opentelemetry-instrumentation-dbapi==0.48b0
281285
# via opentelemetry-instrumentation-aiopg
282286
opentelemetry-instrumentation-fastapi==0.48b0
@@ -303,6 +307,7 @@ opentelemetry-sdk==1.27.0
303307
opentelemetry-semantic-conventions==0.48b0
304308
# via
305309
# opentelemetry-instrumentation-asgi
310+
# opentelemetry-instrumentation-asyncpg
306311
# opentelemetry-instrumentation-dbapi
307312
# opentelemetry-instrumentation-fastapi
308313
# opentelemetry-instrumentation-redis

0 commit comments

Comments
 (0)