Skip to content

Commit 3ff9167

Browse files
committed
fix: connection data parsing when saving tracing records
1 parent 71de4b7 commit 3ff9167

1 file changed

Lines changed: 17 additions & 21 deletions

File tree

  • modules/core/karrio/server/tracing

modules/core/karrio/server/tracing/utils.py

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
import logging
22

3-
from karrio.core.utils import DP, Tracer
4-
from karrio.core.settings import Settings
5-
3+
import karrio.lib as lib
4+
import karrio.server.conf as conf
5+
import karrio.server.core.utils as utils
6+
import karrio.server.tracing.models as models
67
import karrio.server.serializers as serializers
7-
from karrio.server.core import utils
8-
from karrio.server.conf import settings
9-
from karrio.server.tracing import models
108

119
logger = logging.getLogger(__name__)
1210

1311

1412
@utils.error_wrapper
15-
def save_tracing_records(context, tracer: Tracer = None, schema: str = None):
16-
if settings.PERSIST_SDK_TRACING is False:
13+
def save_tracing_records(context, tracer: lib.Tracer = None, schema: str = None):
14+
if conf.settings.PERSIST_SDK_TRACING is False:
1715
return
1816

19-
tracer = tracer or getattr(context, "tracer", Tracer())
17+
tracer = tracer or getattr(context, "tracer", lib.Tracer())
2018

2119
# Process Karrio SDK tracing records to persist records of interest.
2220
@utils.async_wrapper
@@ -28,7 +26,7 @@ def persist_records(**kwarg):
2826

2927
try:
3028
records = []
31-
exists = (
29+
exists = lib.identity(
3230
models.TracingRecord.access_by(context)
3331
.filter(
3432
meta__request_log_id__isnull=False,
@@ -41,24 +39,22 @@ def persist_records(**kwarg):
4139
return
4240

4341
for record in tracer.records:
44-
connection: Settings = record.metadata.get("connection")
42+
connection: dict = record.metadata.get("connection")
4543

4644
records.append(
4745
models.TracingRecord(
4846
key=record.key,
4947
record=record.data,
5048
timestamp=record.timestamp,
5149
created_by_id=getattr(actor, "id", None),
52-
test_mode=getattr(connection, "test_mode", False),
53-
meta=DP.to_dict(
50+
test_mode=connection.get("test_mode", False),
51+
meta=lib.to_dict(
5452
{
5553
"tracer_id": tracer.id,
5654
"object_id": tracer.context.get("object_id"),
57-
"carrier_account_id": getattr(connection, "id", None),
58-
"carrier_id": getattr(connection, "carrier_id", None),
59-
"carrier_name": getattr(
60-
connection, "carrier_name", None
61-
),
55+
"carrier_account_id": connection.get("id"),
56+
"carrier_id": connection.get("carrier_id"),
57+
"carrier_name": connection.get("carrier_name"),
6258
"request_log_id": tracer.context.get("request_log_id"),
6359
}
6460
),
@@ -78,8 +74,8 @@ def persist_records(**kwarg):
7874

7975

8076
@utils.error_wrapper
81-
def bulk_save_tracing_records(tracer: Tracer, context=None):
82-
if settings.PERSIST_SDK_TRACING is False:
77+
def bulk_save_tracing_records(tracer: lib.Tracer, context=None):
78+
if conf.settings.PERSIST_SDK_TRACING is False:
8379
return
8480

8581
if len(tracer.records) == 0 or context is None:
@@ -96,7 +92,7 @@ def bulk_save_tracing_records(tracer: Tracer, context=None):
9692
timestamp=record.timestamp,
9793
test_mode=getattr(context, "test_mode", False),
9894
created_by_id=getattr(context.user, "id", None),
99-
meta=DP.to_dict({"tracer_id": tracer.id, **(record.metadata or {})}),
95+
meta=lib.to_dict({"tracer_id": tracer.id, **(record.metadata or {})}),
10096
)
10197
)
10298

0 commit comments

Comments
 (0)