Skip to content

Commit 02523a7

Browse files
bisgaard-itisbisgaard-itis
committed
Revert "remove asyncpg and aiopg instrumentation"
This reverts commit c7c8469.
1 parent b37c053 commit 02523a7

File tree

17 files changed

+245
-171
lines changed

17 files changed

+245
-171
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.32.1
71+
opentelemetry-api==1.30.0
7272
# via
7373
# opentelemetry-instrumentation
7474
# opentelemetry-instrumentation-asyncpg
7575
# opentelemetry-semantic-conventions
76-
opentelemetry-instrumentation==0.53b1
76+
opentelemetry-instrumentation==0.51b0
7777
# via opentelemetry-instrumentation-asyncpg
78-
opentelemetry-instrumentation-asyncpg==0.53b1
78+
opentelemetry-instrumentation-asyncpg==0.51b0
7979
# via -r requirements/../../../packages/postgres-database/requirements/_base.in
80-
opentelemetry-semantic-conventions==0.53b1
80+
opentelemetry-semantic-conventions==0.51b0
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.32.1
26+
opentelemetry-api==1.30.0
2727
# via
2828
# opentelemetry-instrumentation
2929
# opentelemetry-instrumentation-asyncpg
3030
# opentelemetry-semantic-conventions
31-
opentelemetry-instrumentation==0.53b1
31+
opentelemetry-instrumentation==0.51b0
3232
# via opentelemetry-instrumentation-asyncpg
33-
opentelemetry-instrumentation-asyncpg==0.53b1
33+
opentelemetry-instrumentation-asyncpg==0.51b0
3434
# via -r requirements/_base.in
35-
opentelemetry-semantic-conventions==0.53b1
35+
opentelemetry-semantic-conventions==0.51b0
3636
# via
3737
# opentelemetry-instrumentation
3838
# opentelemetry-instrumentation-asyncpg

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

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

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,29 @@ 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
5355
# opentelemetry-semantic-conventions
5456
opentelemetry-instrumentation==0.51b0
5557
# via
5658
# opentelemetry-instrumentation-aiohttp-client
5759
# opentelemetry-instrumentation-aiohttp-server
60+
# opentelemetry-instrumentation-aiopg
61+
# opentelemetry-instrumentation-dbapi
5862
opentelemetry-instrumentation-aiohttp-client==0.51b0
5963
# via -r requirements/_aiohttp.in
6064
opentelemetry-instrumentation-aiohttp-server==0.51b0
6165
# 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
6270
opentelemetry-semantic-conventions==0.51b0
6371
# via
6472
# opentelemetry-instrumentation
6573
# opentelemetry-instrumentation-aiohttp-client
6674
# opentelemetry-instrumentation-aiohttp-server
75+
# opentelemetry-instrumentation-dbapi
6776
opentelemetry-util-http==0.51b0
6877
# via
6978
# opentelemetry-instrumentation-aiohttp-client
@@ -111,6 +120,8 @@ wrapt==1.17.2
111120
# opentelemetry-instrumentation
112121
# opentelemetry-instrumentation-aiohttp-client
113122
# opentelemetry-instrumentation-aiohttp-server
123+
# opentelemetry-instrumentation-aiopg
124+
# opentelemetry-instrumentation-dbapi
114125
yarl==1.18.3
115126
# via aiohttp
116127
zipp==3.21.0

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@
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
3238
try:
3339
from opentelemetry.instrumentation.requests import RequestsInstrumentor
3440

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

109115
# Instrument aiohttp client
110116
AioHttpClientInstrumentor().instrument()
111-
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()
112124
if HAS_BOTOCORE:
113125
with log_context(
114126
_logger,

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,16 @@
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
2333

2434
HAS_AIOPG = True
2535
except ImportError:
@@ -93,13 +103,27 @@ def initialize_tracing(
93103
# Instrument FastAPI
94104
FastAPIInstrumentor().instrument_app(app)
95105

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()
96113
if HAS_AIOPIKA_INSTRUMENTOR:
97114
with log_context(
98115
_logger,
99116
logging.INFO,
100117
msg="Attempting to add aio_pika opentelemetry autoinstrumentation...",
101118
):
102119
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()
103127
if HAS_REDIS:
104128
with log_context(
105129
_logger,

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,18 @@ 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
130142
try:
131143
from opentelemetry.instrumentation.fastapi import FastAPIInstrumentor
132144

‎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.32.1
153+
opentelemetry-api==1.30.0
154154
# via
155155
# -r requirements/../../../packages/service-library/requirements/_base.in
156156
# opentelemetry-exporter-otlp-proto-grpc
@@ -163,51 +163,51 @@ opentelemetry-api==1.32.1
163163
# opentelemetry-instrumentation-requests
164164
# opentelemetry-sdk
165165
# opentelemetry-semantic-conventions
166-
opentelemetry-exporter-otlp==1.32.1
166+
opentelemetry-exporter-otlp==1.30.0
167167
# via -r requirements/../../../packages/service-library/requirements/_base.in
168-
opentelemetry-exporter-otlp-proto-common==1.32.1
168+
opentelemetry-exporter-otlp-proto-common==1.30.0
169169
# via
170170
# opentelemetry-exporter-otlp-proto-grpc
171171
# opentelemetry-exporter-otlp-proto-http
172-
opentelemetry-exporter-otlp-proto-grpc==1.32.1
172+
opentelemetry-exporter-otlp-proto-grpc==1.30.0
173173
# via opentelemetry-exporter-otlp
174-
opentelemetry-exporter-otlp-proto-http==1.32.1
174+
opentelemetry-exporter-otlp-proto-http==1.30.0
175175
# via opentelemetry-exporter-otlp
176-
opentelemetry-instrumentation==0.53b1
176+
opentelemetry-instrumentation==0.51b0
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.53b1
183+
opentelemetry-instrumentation-aio-pika==0.51b0
184184
# via -r requirements/../../../packages/service-library/requirements/_base.in
185-
opentelemetry-instrumentation-asyncpg==0.53b1
185+
opentelemetry-instrumentation-asyncpg==0.51b0
186186
# via -r requirements/../../../packages/postgres-database/requirements/_base.in
187-
opentelemetry-instrumentation-logging==0.53b1
187+
opentelemetry-instrumentation-logging==0.51b0
188188
# via -r requirements/../../../packages/service-library/requirements/_base.in
189-
opentelemetry-instrumentation-redis==0.53b1
189+
opentelemetry-instrumentation-redis==0.51b0
190190
# via -r requirements/../../../packages/service-library/requirements/_base.in
191-
opentelemetry-instrumentation-requests==0.53b1
191+
opentelemetry-instrumentation-requests==0.51b0
192192
# via -r requirements/../../../packages/service-library/requirements/_base.in
193-
opentelemetry-proto==1.32.1
193+
opentelemetry-proto==1.30.0
194194
# via
195195
# opentelemetry-exporter-otlp-proto-common
196196
# opentelemetry-exporter-otlp-proto-grpc
197197
# opentelemetry-exporter-otlp-proto-http
198-
opentelemetry-sdk==1.32.1
198+
opentelemetry-sdk==1.30.0
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.53b1
203+
opentelemetry-semantic-conventions==0.51b0
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.53b1
210+
opentelemetry-util-http==0.51b0
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.32.1
344+
opentelemetry-api==1.28.2
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.32.1
358358
# opentelemetry-instrumentation-requests
359359
# opentelemetry-sdk
360360
# opentelemetry-semantic-conventions
361-
opentelemetry-exporter-otlp==1.32.1
361+
opentelemetry-exporter-otlp==1.28.2
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.32.1
365+
opentelemetry-exporter-otlp-proto-common==1.28.2
366366
# via
367367
# opentelemetry-exporter-otlp-proto-grpc
368368
# opentelemetry-exporter-otlp-proto-http
369-
opentelemetry-exporter-otlp-proto-grpc==1.32.1
369+
opentelemetry-exporter-otlp-proto-grpc==1.28.2
370370
# via opentelemetry-exporter-otlp
371-
opentelemetry-exporter-otlp-proto-http==1.32.1
371+
opentelemetry-exporter-otlp-proto-http==1.28.2
372372
# via opentelemetry-exporter-otlp
373-
opentelemetry-instrumentation==0.53b1
373+
opentelemetry-instrumentation==0.49b2
374374
# via
375375
# opentelemetry-instrumentation-aio-pika
376376
# opentelemetry-instrumentation-asgi
@@ -380,44 +380,44 @@ opentelemetry-instrumentation==0.53b1
380380
# opentelemetry-instrumentation-logging
381381
# opentelemetry-instrumentation-redis
382382
# opentelemetry-instrumentation-requests
383-
opentelemetry-instrumentation-aio-pika==0.53b1
383+
opentelemetry-instrumentation-aio-pika==0.49b2
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.53b1
387+
opentelemetry-instrumentation-asgi==0.49b2
388388
# via opentelemetry-instrumentation-fastapi
389-
opentelemetry-instrumentation-asyncpg==0.53b1
389+
opentelemetry-instrumentation-asyncpg==0.49b2
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.53b1
393+
opentelemetry-instrumentation-fastapi==0.49b2
394394
# via -r requirements/../../../packages/service-library/requirements/_fastapi.in
395-
opentelemetry-instrumentation-httpx==0.53b1
395+
opentelemetry-instrumentation-httpx==0.49b2
396396
# via -r requirements/../../../packages/service-library/requirements/_fastapi.in
397-
opentelemetry-instrumentation-logging==0.53b1
397+
opentelemetry-instrumentation-logging==0.49b2
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.53b1
401+
opentelemetry-instrumentation-redis==0.49b2
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.53b1
405+
opentelemetry-instrumentation-requests==0.49b2
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.32.1
409+
opentelemetry-proto==1.28.2
410410
# via
411411
# opentelemetry-exporter-otlp-proto-common
412412
# opentelemetry-exporter-otlp-proto-grpc
413413
# opentelemetry-exporter-otlp-proto-http
414-
opentelemetry-sdk==1.32.1
414+
opentelemetry-sdk==1.28.2
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.53b1
420+
opentelemetry-semantic-conventions==0.49b2
421421
# via
422422
# opentelemetry-instrumentation
423423
# opentelemetry-instrumentation-asgi
@@ -427,7 +427,7 @@ opentelemetry-semantic-conventions==0.53b1
427427
# opentelemetry-instrumentation-redis
428428
# opentelemetry-instrumentation-requests
429429
# opentelemetry-sdk
430-
opentelemetry-util-http==0.53b1
430+
opentelemetry-util-http==0.49b2
431431
# via
432432
# opentelemetry-instrumentation-asgi
433433
# opentelemetry-instrumentation-fastapi

0 commit comments

Comments
 (0)