Skip to content

Commit 47b5c4e

Browse files
committed
pre-commit
1 parent 59d0d33 commit 47b5c4e

File tree

2 files changed

+24
-10
lines changed
  • examples/handlers/opentelemetry_structlog
  • handlers/opentelemetry_structlog/src

2 files changed

+24
-10
lines changed

examples/handlers/opentelemetry_structlog/app.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1+
import sys
12
from random import randint
2-
from flask import Flask, request
3+
34
import structlog
4-
import sys
5+
from flask import Flask, request
56

67
sys.path.insert(0, "../../..")
78
from handlers.opentelemetry_structlog.src.exporter import StructlogHandler
9+
from opentelemetry._logs import set_logger_provider
810
from opentelemetry.exporter.otlp.proto.grpc._log_exporter import (
911
OTLPLogExporter,
1012
)
1113
from opentelemetry.sdk._logs import LoggerProvider
1214
from opentelemetry.sdk.resources import Resource
13-
from opentelemetry._logs import set_logger_provider
1415

1516
logger_provider = LoggerProvider(
1617
resource=Resource.create(
@@ -43,7 +44,10 @@ def roll_dice():
4344
result = str(roll())
4445
if player:
4546
structlog_logger.warning(
46-
"Player %s is rolling the dice: %s", player, result, level="warning"
47+
"Player %s is rolling the dice: %s",
48+
player,
49+
result,
50+
level="warning",
4751
)
4852
else:
4953
structlog_logger.warning(

handlers/opentelemetry_structlog/src/exporter.py

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,19 @@
55
from typing import Dict
66

77
import structlog
8+
from structlog._frames import _format_exception
9+
from structlog._log_levels import NAME_TO_LEVEL
10+
from structlog.processors import _figure_out_exc_info
11+
812
from opentelemetry._logs import std_to_otel
913
from opentelemetry.sdk._logs._internal import LoggerProvider, LogRecord
10-
from opentelemetry.sdk._logs._internal.export import BatchLogRecordProcessor, LogExporter
14+
from opentelemetry.sdk._logs._internal.export import (
15+
BatchLogRecordProcessor,
16+
LogExporter,
17+
)
1118
from opentelemetry.sdk.resources import Resource
1219
from opentelemetry.semconv.trace import SpanAttributes
1320
from opentelemetry.trace import get_current_span
14-
from structlog._frames import _format_exception
15-
from structlog._log_levels import NAME_TO_LEVEL
16-
from structlog.processors import _figure_out_exc_info
1721

1822
_EXCLUDE_ATTRS = {"exception", "timestamp"}
1923

@@ -112,7 +116,11 @@ def _translate(
112116
body=event_dict["event"],
113117
resource=self._logger.resource,
114118
attributes={
115-
**{k: v for k, v in event_dict.items() if k not in _EXCLUDE_ATTRS},
119+
**{
120+
k: v
121+
for k, v in event_dict.items()
122+
if k not in _EXCLUDE_ATTRS
123+
},
116124
**extra_attrs,
117125
},
118126
)
@@ -122,7 +130,9 @@ def _parse_timestamp(event_dict: structlog.typing.EventDict) -> int:
122130
return int(event_dict["timestamp"].timestamp() * 1e9)
123131

124132
@staticmethod
125-
def _parse_exception(event_dict: structlog.typing.EventDict) -> Dict[str, str]:
133+
def _parse_exception(
134+
event_dict: structlog.typing.EventDict,
135+
) -> Dict[str, str]:
126136
# taken from: https://github.com/open-telemetry/opentelemetry-python/blob/c4d17e9f14f3cafb6757b96eefabdc7ed4891306/opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/__init__.py#L458-L475
127137
attributes: Dict[str, str] = {}
128138
exception = event_dict.get("exception", None)

0 commit comments

Comments
 (0)