Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 Fix aiohttp server autoinstrumentation #6391

Merged
merged 83 commits into from
Oct 15, 2024
Merged
Changes from 3 commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
5160d11
Fix aiohttp server autoinstrumentation with a hack
mrnicegyu11 Sep 18, 2024
c777852
Merge branch 'master' into 2024/fix/tracing
mrnicegyu11 Sep 18, 2024
aa730ed
Merge branch 'master' into 2024/fix/tracing
mrnicegyu11 Sep 19, 2024
61366a3
minor: fix typo
mrnicegyu11 Oct 2, 2024
d1a70da
🎨 backend pulls inputs before iframe is displayed (#6392)
GitHK Sep 19, 2024
77e54ce
🚨🐛 Mitigate dy-service file upload bug: Increase traefik timeouts (#6…
mrnicegyu11 Sep 19, 2024
b44eb75
✨ [Frontend] Force reload ``no-cache`` (#6397)
odeimaiz Sep 19, 2024
ed2db58
🐛⚗️Prometheus instrumentation incorrectly setup (#6398)
sanderegg Sep 19, 2024
51edfa8
✨E2E: increase timeout for video streaming and improve a bit logs abo…
sanderegg Sep 20, 2024
26aa165
🎨Clusters keeper/use ssm (🚨change in private clusters) (#6361)
sanderegg Sep 20, 2024
9ebe05b
♻️CI: autoscaling mypy takes longer and longer. (#6417)
sanderegg Sep 20, 2024
060c9cb
🐛 Improved Error Handling for Missing Billing Details (#6418)
pcrespov Sep 21, 2024
ffba5ae
🎨 Enhances Product parsing to strip whitespaces in host_regex (#6419)
pcrespov Sep 23, 2024
2e287ab
🐛 [Frontend] Fix: Share and Leave Study (#6401)
odeimaiz Sep 23, 2024
a876819
✨ [Frontend] Workspaces & Folders: Merge Workspace header and Folder …
odeimaiz Sep 23, 2024
fcc7b78
🎨 [Frontend] Access Full TIP (#6423)
odeimaiz Sep 23, 2024
0a11c8e
🐛 [Frontend] Do not list/request ``/frontend/`` service's pricing pla…
odeimaiz Sep 23, 2024
e5b9664
Bump actions/setup-node from 4.0.3 to 4.0.4 (#6425)
dependabot[bot] Sep 23, 2024
2129de4
🎨 Persistent logs when GC removes services (#6403)
GitHK Sep 24, 2024
84119ba
🎨 The user can remove themselves from the project/workspace. (#6415)
matusdrobuliak66 Sep 24, 2024
aa0b57c
♻️ Maintenance: removing old folders (#6383)
matusdrobuliak66 Sep 24, 2024
83b3152
🎨 improve DB foreign key dependencies (🗃️) (#6428)
matusdrobuliak66 Sep 24, 2024
529122e
✨ `dynamic-scheduler` pushes service state to the frontend (⚠️ devops…
GitHK Sep 24, 2024
5457f0d
🐛 [Frontend] Fix: Do not listen to output related backend updates if …
odeimaiz Sep 24, 2024
0b7f87e
✅ e2e: new workflow to test `tiplite` (#6388)
pcrespov Sep 24, 2024
83c79c6
🎨 [Frontend] App mode: Scrollable Instructions (#6430)
odeimaiz Sep 24, 2024
a712acc
🎨 publish port events to frontend (#6396)
GitHK Sep 25, 2024
8a8319f
🔒️ Strip credentials form image VCS (#6433)
GitHK Sep 25, 2024
699e05b
⬆️ Sep tests and tooling upgrade (#6431)
mrnicegyu11 Oct 2, 2024
aaee3b2
✅ fixes check on full version (#6445)
pcrespov Sep 25, 2024
aa87f17
🐛 Fixes flaky tests in service-library test_deferred_tasks.py (#6439)
GitHK Sep 25, 2024
97ccf19
🐛 [Frontend] Announcements: allow in ribbon only (#6440)
odeimaiz Sep 25, 2024
76e96c7
🎨 improve error handling on pricing plans (#6436)
matusdrobuliak66 Sep 25, 2024
02a7908
🐛[FrontEnd] Better error handling of invalid pre-registration data (#…
pcrespov Sep 25, 2024
6b7f9f8
e2e: fixes wrong sequence in classic tip (#6450)
pcrespov Sep 25, 2024
e2a6bdc
🎨 improve tip e2e test (#6448)
matusdrobuliak66 Sep 25, 2024
32bedc7
🐛 Fixes issue with parsing logs polluting sidecar logs (#6442)
GitHK Sep 26, 2024
bd45d6b
🎨 [Frontend] TIP: Rebranding (#6446)
odeimaiz Sep 26, 2024
b6ca20a
Adding favicon for all devices (#6447)
jsaq007 Sep 26, 2024
f01b218
🎨 [Frontend] Unify ``border-radius`` (#6451)
odeimaiz Sep 26, 2024
3200fe2
🐛 fix tip e2e test (#6458)
matusdrobuliak66 Sep 27, 2024
925b817
🎨 adding `folder_id` to project resource (#6460)
matusdrobuliak66 Sep 27, 2024
7dab0e1
✅ e2e: Final touches to tip testing (#6459)
pcrespov Sep 27, 2024
afce906
✅ e2e: Fixes typo in tests (#6468)
pcrespov Sep 30, 2024
c0ba01a
✨ [Frontend] Keep View Mode in localStorage (#6463)
odeimaiz Sep 30, 2024
54e8174
🎨 [Frontend] Move multiple studies at once (#6457)
odeimaiz Sep 30, 2024
d74fa86
✨ New repository helpers on asyncpg (#6465)
pcrespov Sep 30, 2024
eca803b
♻️ Preparations in webserver to integrate asyncpg engine (#6466)
pcrespov Sep 30, 2024
cd9b335
✨ introduce `/projects:search` full search (#6464)
matusdrobuliak66 Sep 30, 2024
d34ac48
🎨 Frees up space on runner for `[build] docker images` part of the CI…
GitHK Oct 1, 2024
4cf5278
🐛🎨 Fixes unhandled config error and new log helpers for better troubl…
pcrespov Oct 1, 2024
a90d033
🎨 [Frontend] S4L: Include deprecated versions in plus button, they sh…
odeimaiz Oct 1, 2024
38ea07a
🐛 [Frontend] Guided Tours: point to visible selector or skip (#6481)
odeimaiz Oct 1, 2024
5560acd
🔨📝 Misc improvements in tooling and doc (#6478)
pcrespov Oct 1, 2024
6c46d46
Merge remote-tracking branch 'upstream/master' into 2024/fix/tracing
mrnicegyu11 Oct 2, 2024
8f06a87
Add verbose comment for special call to add midleware
mrnicegyu11 Oct 2, 2024
89d9a1d
Merge branch 'master' into 2024/fix/tracing
mrnicegyu11 Oct 2, 2024
68c6aef
Merge branch 'master' into 2024/fix/tracing
mrnicegyu11 Oct 2, 2024
6588f3b
🐛 [Frontend] Move grouped nodes (#6486)
odeimaiz Oct 2, 2024
0f1ef1d
🎨 [Frontend] Handle LongRunningTask errors better (#6485)
odeimaiz Oct 2, 2024
e3cfd8b
🐛 [Frontend] Fix for Folders disabled scenario (#6488)
odeimaiz Oct 3, 2024
b7065d9
🐛 archiving_utils creates deterministic zip archives (#6472)
GitHK Oct 3, 2024
b936411
🐛 Fixes duplicates in tags listings and new `priority` to enforce ord…
pcrespov Oct 3, 2024
2dfed79
✨Releases public-api 0.7 (#6489)
pcrespov Oct 4, 2024
1b728af
♻️ Polished and modernised agent service ⚠️ (#6452)
GitHK Oct 4, 2024
783bb1d
🎨 improve project full search (#6483)
matusdrobuliak66 Oct 4, 2024
f4dc38b
🎨 efs improvements (group extra properties) 🗃️ (#6493)
matusdrobuliak66 Oct 7, 2024
f074e42
🐛 Front-end: fixes PO center widget (#6496)
pcrespov Oct 7, 2024
3ca168d
🎨 Adds authentication for new style dynamic services and platform ven…
GitHK Oct 8, 2024
8b34d98
🎨 Expose env var to raise timeout of downloading/uploading data to an…
GitHK Oct 8, 2024
26e7fd6
🔨 New sql script template to remove readonly user (#6500)
pcrespov Oct 8, 2024
475fd13
🐛 Fixes bad formatting while handling missing configuration errors (#…
pcrespov Oct 8, 2024
9c8d0ec
♻️ increase e2e tip test timeout (#6504)
matusdrobuliak66 Oct 9, 2024
4d27c32
🎨 EFS Guardian: adding size monitoring (#6502)
matusdrobuliak66 Oct 10, 2024
42682d5
Merge remote-tracking branch 'upstream/master' into 2024/fix/tracing
mrnicegyu11 Oct 14, 2024
3ad20a7
Add middleware test
mrnicegyu11 Oct 14, 2024
d98371d
Merge branch 'master' into 2024/fix/tracing
mrnicegyu11 Oct 14, 2024
cf3eaa0
refactors test
pcrespov Oct 14, 2024
c3371b5
moves environs
pcrespov Oct 14, 2024
a29b33a
Merge branch 'master' into 2024/fix/tracing
mrnicegyu11 Oct 15, 2024
2134327
Adress pylint
mrnicegyu11 Oct 15, 2024
e62cb83
Merge branch 'master' into 2024/fix/tracing
mrnicegyu11 Oct 15, 2024
ebc9e8f
Merge branch 'master' into 2024/fix/tracing
mrnicegyu11 Oct 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions packages/service-library/src/servicelib/aiohttp/tracing.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@
OTLPSpanExporter as OTLPSpanExporterHTTP,
)
from opentelemetry.instrumentation.aiohttp_client import AioHttpClientInstrumentor
from opentelemetry.instrumentation.aiohttp_server import AioHttpServerInstrumentor
from opentelemetry.instrumentation.aiohttp_server import (
AioHttpServerInstrumentor,
middleware,
)
from opentelemetry.instrumentation.aiopg import AiopgInstrumentor
from opentelemetry.instrumentation.requests import RequestsInstrumentor
from opentelemetry.sdk.resources import Resource
Expand All @@ -21,7 +24,7 @@


def setup_tracing(
app: web.Application, # pylint: disable=unused-argument
app: web.Application,
tracing_settings: TracingSettings,
service_name: str,
instrument_aiopg: bool = False, # noqa: FBT001, FBT002
Expand All @@ -37,9 +40,8 @@ def setup_tracing(
log.warning("Skipping opentelemetry tracing setup")
return
if not opentelemetry_collector_endpoint or not opentelemetry_collector_port:
raise RuntimeError(
f"Variable opentelemetry_collector_endpoint [{tracing_settings.TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}] or opentelemetry_collector_port [{tracing_settings.TRACING_OPENTELEMETRY_COLLECTOR_PORT}] unset. Tracing options incomplete."
)
msg = f"Variable opentelemetry_collector_endpoint [{tracing_settings.TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}] or opentelemetry_collector_port [{tracing_settings.TRACING_OPENTELEMETRY_COLLECTOR_PORT}] unset. Tracing options incomplete."
raise RuntimeError(msg)
resource = Resource(attributes={"service.name": service_name})
trace.set_tracer_provider(TracerProvider(resource=resource))
tracer_provider: trace.TracerProvider = trace.get_tracer_provider()
Expand All @@ -61,6 +63,7 @@ def setup_tracing(
tracer_provider.add_span_processor(BatchSpanProcessor(otlp_exporter)) # type: ignore[attr-defined] # https://github.com/open-telemetry/opentelemetry-python/issues/3713
# Instrument aiohttp server and client
AioHttpServerInstrumentor().instrument()
mrnicegyu11 marked this conversation as resolved.
Show resolved Hide resolved
app.middlewares.append(middleware)
pcrespov marked this conversation as resolved.
Show resolved Hide resolved
AioHttpClientInstrumentor().instrument()
if instrument_aiopg:
AiopgInstrumentor().instrument()
Expand Down
Loading