Skip to content

Commit 4b06b6c

Browse files
authored
Merge pull request #12 from Msameim181/fix/package_management
fix: enhance the core.
2 parents 3e602f6 + 02f2700 commit 4b06b6c

File tree

5 files changed

+21
-16
lines changed

5 files changed

+21
-16
lines changed

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,11 @@ The two first log was out of trace and the trace ID was not added to the log mes
149149
### FastAPI Integration
150150

151151
```python
152-
from chromatrace import RequestIdMiddleware
152+
from chromatrace.fastapi import RequestIdMiddleware as FastAPIRequestIdMiddleware
153+
from chromatrace.django import RequestIdMiddleware as DjangoRequestIdMiddleware
153154

154155
app = FastAPI()
155-
app.add_middleware(RequestIdMiddleware)
156+
app.add_middleware(FastAPIRequestIdMiddleware)
156157
```
157158

158159
Result:
@@ -176,7 +177,7 @@ As you can see, the request ID - `R-ffe0a9a2` is automatically added to the log
176177
### SocketIO Integration
177178

178179
```python
179-
from chromatrace import SocketRequestIdMiddleware
180+
from chromatrace.socketio import SocketRequestIdMiddleware
180181

181182
socket_application = SocketRequestIdMiddleware(socket_application)
182183
```

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
44

55
[project]
66
name = "chromatrace"
7-
version = "0.2.12"
7+
version = "0.2.13"
88
description = "Advanced Python logging with tracing, coloring and FastAPI, Django, and SocketIO integrations"
99
readme = "README.md"
1010
authors = [

src/chromatrace/__init__.py

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
1-
from .django import RequestIdMiddleware as DjangoRequestIdMiddleware # noqa
2-
from .fastapi import RequestIdMiddleware as FastAPIRequestIdMiddleware # noqa
3-
from .logging_config import LoggingConfig # noqa
4-
from .logging_settings import LoggingSettings # noqa
5-
from .socketio import SocketRequestIdMiddleware # noqa
6-
from .tracer import ( # noqa
1+
from .logging_config import LoggingConfig
2+
from .logging_settings import LoggingSettings
3+
from .tracer import (
74
RequestIdContext,
85
get_trace_id,
96
trace_id_ctx,
107
tracer,
118
)
12-
from .uvicorn import GetLoggingConfig, UvicornLoggingSettings # noqa: F401
9+
10+
__all__ = [
11+
"LoggingConfig",
12+
"LoggingSettings",
13+
"RequestIdContext",
14+
"get_trace_id",
15+
"trace_id_ctx",
16+
"tracer",
17+
]

src/examples/frameworks/socket_app.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
import socketio
55
import uvicorn
66
from chromatrace import (
7-
GetLoggingConfig,
87
LoggingConfig,
9-
SocketRequestIdMiddleware,
10-
UvicornLoggingSettings,
118
)
9+
from chromatrace.socketio import SocketRequestIdMiddleware
10+
from chromatrace.uvicorn import GetLoggingConfig, UvicornLoggingSettings
1211

1312

1413
class SocketServerConfig:

test/logger_test.py

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

66
import pytest
7-
from chromatrace import FastAPIRequestIdMiddleware as FastAPIMiddleware
87
from chromatrace import (
98
LoggingConfig,
109
LoggingSettings,
1110
RequestIdContext,
12-
SocketRequestIdMiddleware,
1311
trace_id_ctx,
1412
tracer,
1513
)
14+
from chromatrace.fastapi import RequestIdMiddleware as FastAPIMiddleware
1615
from chromatrace.logging_settings import ApplicationLevelFilter, BasicFormatter
16+
from chromatrace.socketio import SocketRequestIdMiddleware
1717
from chromatrace.tracer import RequestIdFilter
1818
from fastapi import FastAPI
1919
from fastapi.testclient import TestClient

0 commit comments

Comments
 (0)