From d90aef716adeab32daa81ea5fce789ea6b627aaf Mon Sep 17 00:00:00 2001 From: CharaWein Date: Thu, 12 Nov 2026 14:19:40 +0300 Subject: [PATCH] =?UTF-8?q?lab6:=20=D0=B4=D0=BE=D0=BB=D1=8F=20=D0=91=D0=94?= =?UTF-8?q?=20=D0=B2=20=D1=82=D1=80=D0=B0=D1=81=D1=81=D0=B5=20=E2=80=94=20?= =?UTF-8?q?=D0=BF=D0=BE=20=D1=81=D0=B0=D0=BC=D0=BE=D0=BC=D1=83=20=D0=B4?= =?UTF-8?q?=D0=BB=D0=B8=D0=BD=D0=BD=D0=BE=D0=BC=D1=83=20span=20(=D0=B1?= =?UTF-8?q?=D0=B5=D0=B7=20=D0=B4=D0=B2=D0=BE=D0=B9=D0=BD=D0=BE=D0=B3=D0=BE?= =?UTF-8?q?=20=D1=81=D1=87=D1=91=D1=82=D0=B0=20=D0=B2=D0=BB=D0=BE=D0=B6?= =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D1=8B=D1=85)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- student-tests/observability_ops.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/student-tests/observability_ops.py b/student-tests/observability_ops.py index 68d1ca1..6b44def 100644 --- a/student-tests/observability_ops.py +++ b/student-tests/observability_ops.py @@ -298,11 +298,14 @@ def breakdown(spans): srv = next((s for s in spans if s['parent'] == '' or s['name'].startswith(('POST /api', 'GET /api'))), None) if not srv: return None - db = sum(s['ms'] for s in spans if s['service'] == srv['service'] and is_db(s)) - s3 = sum(s['ms'] for s in spans if s['name'].startswith('S3')) + # DB-spans вложены (BEGIN/batch/query): сумма перекрывается, поэтому берём самый + # длинный отдельный span БД относительно server span. + dbs = sorted(((s['name'], s['ms']) for s in spans if s['service'] == srv['service'] and is_db(s)), key=lambda x: -x[1]) + db = dbs[0][1] if dbs else 0.0 + s3 = max([s['ms'] for s in spans if s['name'].startswith('S3')] or [0.0]) return {'server_span': srv['name'], 'server_ms': srv['ms'], 'status': srv['attrs'].get('http.response.status_code'), - 'db_ms': round(db, 1), 's3_ms': round(s3, 1), 'db_share': round(db / srv['ms'], 3) if srv['ms'] else None, - 'db_spans': [(s['name'], s['ms']) for s in spans if is_db(s)][:6]} + 'longest_db_span_ms': round(db, 1), 'longest_s3_span_ms': round(s3, 1), + 'db_share': round(db / srv['ms'], 3) if srv['ms'] else None, 'db_spans_longest': dbs[:4]} def scenario_incident_db(c):