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
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["uv_build>=0.9.17,<0.10.0"]
requires = ["uv_build>=0.10.4,<0.11.0"]
build-backend = "uv_build"

[project]
Expand Down Expand Up @@ -38,8 +38,8 @@ version_file = "src/mh_structlog/_version.py"
[dependency-groups]
dev = [
"ipdb>=0.13.13",
"ipython>=8.18.1",
"ruff>=0.14.9",
"ipython>=8.38.0",
"ruff>=0.15.1",
]
tests = [
"coverage>=7.13.0",
Expand All @@ -54,7 +54,7 @@ tests = [
]

[tool.uv]
required-version = ">=0.9.17"
required-version = ">=0.10.4"
package = true
environments = [
"sys_platform == 'darwin'",
Expand Down
18 changes: 1 addition & 17 deletions src/mh_structlog/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,9 @@

from logging import CRITICAL, DEBUG, ERROR, FATAL, INFO, WARN, WARNING

import structlog

from .config import filter_named_logger, setup
from .processors import FieldDropper, FieldRenamer, FieldsAdder
from .utils import determine_name_for_logger


def getLogger(name: str | None = None): # noqa: ANN201, N802
"""Return a named logger."""
if name is None:
name = determine_name_for_logger()
return structlog.get_logger(name)


def get_logger(name: str | None = None): # noqa: ANN201
"""Return a named logger."""
return getLogger(name)
from .utils import get_logger, getLogger


__all__ = [
Expand All @@ -34,8 +20,6 @@ def get_logger(name: str | None = None): # noqa: ANN201
"FieldsAdder",
"filter_named_logger",
"getLogger",
"getLogger",
"get_logger",
"get_logger",
"setup",
]
4 changes: 2 additions & 2 deletions src/mh_structlog/aws.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ def _reset_cold_start_flag() -> None:
is_cold_start = True


def bind_lambda_context(lambda_context: LambdaContext) -> None:
def bind_lambda_context(lambda_context: LambdaContext | None = None) -> None:
"""Bind AWS Lambda context information to the structlog context variables, so log entries contain Lambda function metadata.

Args:
lambda_context (LambdaContext): The AWS Lambda context object.
lambda_context (LambdaContext | None): The AWS Lambda context object.
"""
global is_cold_start # noqa: PLW0603

Expand Down
16 changes: 15 additions & 1 deletion src/mh_structlog/utils.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import inspect
from pathlib import Path

import structlog


def determine_name_for_logger():
"""Return a name for a logger depending on the stackframe."""
Expand All @@ -19,4 +21,16 @@ def determine_name_for_logger():
for location in [cwd, 'var.task', 'src', 'code', 'app']:
name = name.removeprefix(f'{location}.')

return name
return name.strip('.')


def getLogger(name: str | None = None): # noqa: ANN201, N802
"""Return a named logger."""
if name is None:
name = determine_name_for_logger()
return structlog.get_logger(name)


def get_logger(name: str | None = None): # noqa: ANN201
"""Return a named logger."""
return getLogger(name)
Loading