Skip to content

Commit 7097063

Browse files
committed
chore: refactor imports and clean up code
* Removed unused arguments in `SysLogFormatter`. * Organized import statements across multiple files for consistency. * Ensured all files end with a newline for better compatibility.
1 parent 675f34f commit 7097063

10 files changed

Lines changed: 18 additions & 12 deletions

File tree

src/chromatrace/RabbitMQ.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ def callback(ch, method, properties, body):
3030
with rabbitmq_trace_context(ch, properties):
3131
on_message_callback(ch, method, properties, body)
3232
self.channel.basic_consume(queue=queue, on_message_callback=callback, auto_ack=auto_ack)
33-
self.channel.start_consuming()
33+
self.channel.start_consuming()

src/chromatrace/fastapi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ async def dispatch(self, request: Request, call_next):
1010
with RequestIdContext(request_id):
1111
response = await call_next(request)
1212
response.headers["X-Request-ID"] = trace_id_ctx.get()
13-
return response
13+
return response

src/chromatrace/logging_settings.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ def __init__(
132132
super().__init__(
133133
message_splitter=message_splitter,
134134
log_splitter=log_splitter,
135-
*args,
136135
**kwargs,
137136
)
138137

src/examples/adaptors/socket_client.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
from typing import Dict, List, Optional
77

88
import socketio
9+
from pydantic import BaseModel, Field
10+
911
from chromatrace import LoggingConfig, LoggingSettings
1012
from chromatrace.tracer import trace_id_ctx
11-
from pydantic import BaseModel, Field
1213

1314
logging_config = LoggingConfig(
1415
LoggingSettings(

src/examples/frameworks/api_app.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import multiprocessing
22

33
import uvicorn
4-
from chromatrace import LoggingConfig
5-
from chromatrace.fastapi import RequestIdMiddleware
6-
from chromatrace.uvicorn import GetLoggingConfig, UvicornLoggingSettings
74
from fastapi import FastAPI
85
from fastapi.middleware.cors import CORSMiddleware
96
from usecases import AnotherSample, ExampleService
107

8+
from chromatrace import LoggingConfig
9+
from chromatrace.fastapi import RequestIdMiddleware
10+
from chromatrace.uvicorn import GetLoggingConfig, UvicornLoggingSettings
11+
1112

1213
class APIService:
1314
def __init__(

src/examples/frameworks/socket_app.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
import socketio
55
import uvicorn
6+
67
from chromatrace import (
78
LoggingConfig,
89
)

src/examples/injection.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
from chromatrace import LoggingSettings
21
from dependency import container
32
from frameworks.api_app import APIService
43
from frameworks.socket_app import SocketService
54
from lagom import Singleton
65

6+
from chromatrace import LoggingSettings
7+
78
container[LoggingSettings] = LoggingSettings(
89
application_level="Development",
910
enable_tracing=True,

src/examples/main.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
import sys
33

44
import injection # noqa
5-
from chromatrace import LoggingConfig, LoggingSettings, tracer
65
from dependency import container
76
from frameworks.api_app import APIService
87
from frameworks.socket_app import SocketService
98
from usecases.example_service import ExampleService
109
from usecases.sample import AnotherSample
1110

11+
from chromatrace import LoggingConfig, LoggingSettings, tracer
12+
1213
sys.stdout.reconfigure(encoding="utf-8")
1314

1415

src/examples/tests/chromatrace_test.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
import injection # noqa
55
import pytest
66
from adaptors.socket_client import SocketClient, SocketClientConfig
7-
from chromatrace import LoggingConfig
87
from dependency import container
98
from frameworks.api_app import APIService
109
from frameworks.socket_app import SocketService
1110
from usecases.example_service import ExampleService, InnerService
1211
from usecases.sample import AnotherSample
1312

13+
from chromatrace import LoggingConfig
14+
1415

1516
class TestChromatrace:
1617
@pytest.fixture(scope="class")

test/logger_test.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
from io import StringIO
55

66
import pytest
7+
from fastapi import FastAPI
8+
from fastapi.testclient import TestClient
9+
710
from chromatrace import (
811
LoggingConfig,
912
LoggingSettings,
@@ -15,8 +18,6 @@
1518
from chromatrace.logging_settings import ApplicationLevelFilter, BasicFormatter
1619
from chromatrace.socketio import SocketRequestIdMiddleware
1720
from chromatrace.tracer import RequestIdFilter
18-
from fastapi import FastAPI
19-
from fastapi.testclient import TestClient
2021

2122

2223
class TestLoggingConfiguration:

0 commit comments

Comments
 (0)