Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,11 @@ The two first log was out of trace and the trace ID was not added to the log mes
### FastAPI Integration

```python
from chromatrace import RequestIdMiddleware
from chromatrace.fastapi import RequestIdMiddleware as FastAPIRequestIdMiddleware
from chromatrace.django import RequestIdMiddleware as DjangoRequestIdMiddleware

app = FastAPI()
app.add_middleware(RequestIdMiddleware)
app.add_middleware(FastAPIRequestIdMiddleware)
```

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

```python
from chromatrace import SocketRequestIdMiddleware
from chromatrace.socketio import SocketRequestIdMiddleware

socket_application = SocketRequestIdMiddleware(socket_application)
```
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "hatchling.build"

[project]
name = "chromatrace"
version = "0.2.12"
version = "0.2.13"
description = "Advanced Python logging with tracing, coloring and FastAPI, Django, and SocketIO integrations"
readme = "README.md"
authors = [
Expand Down
19 changes: 12 additions & 7 deletions src/chromatrace/__init__.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
from .django import RequestIdMiddleware as DjangoRequestIdMiddleware # noqa
from .fastapi import RequestIdMiddleware as FastAPIRequestIdMiddleware # noqa
from .logging_config import LoggingConfig # noqa
from .logging_settings import LoggingSettings # noqa
from .socketio import SocketRequestIdMiddleware # noqa
from .tracer import ( # noqa
from .logging_config import LoggingConfig
from .logging_settings import LoggingSettings
from .tracer import (
RequestIdContext,
get_trace_id,
trace_id_ctx,
tracer,
)
from .uvicorn import GetLoggingConfig, UvicornLoggingSettings # noqa: F401

__all__ = [
"LoggingConfig",
"LoggingSettings",
"RequestIdContext",
"get_trace_id",
"trace_id_ctx",
"tracer",
]
5 changes: 2 additions & 3 deletions src/examples/frameworks/socket_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@
import socketio
import uvicorn
from chromatrace import (
GetLoggingConfig,
LoggingConfig,
SocketRequestIdMiddleware,
UvicornLoggingSettings,
)
from chromatrace.socketio import SocketRequestIdMiddleware
from chromatrace.uvicorn import GetLoggingConfig, UvicornLoggingSettings


class SocketServerConfig:
Expand Down
4 changes: 2 additions & 2 deletions test/logger_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
from io import StringIO

import pytest
from chromatrace import FastAPIRequestIdMiddleware as FastAPIMiddleware
from chromatrace import (
LoggingConfig,
LoggingSettings,
RequestIdContext,
SocketRequestIdMiddleware,
trace_id_ctx,
tracer,
)
from chromatrace.fastapi import RequestIdMiddleware as FastAPIMiddleware
from chromatrace.logging_settings import ApplicationLevelFilter, BasicFormatter
from chromatrace.socketio import SocketRequestIdMiddleware
from chromatrace.tracer import RequestIdFilter
from fastapi import FastAPI
from fastapi.testclient import TestClient
Expand Down