Skip to content

Commit be673f6

Browse files
Merging from develop
1 parent 27600da commit be673f6

File tree

2 files changed

+1
-65
lines changed

2 files changed

+1
-65
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
11
class InvalidLoggerSamplingRateError(Exception):
22
pass
3-
4-
5-
class OrphanedChildLoggerError(Exception):
6-
pass

tests/functional/test_logger.py

+1-61
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
from aws_lambda_powertools import Logger, Tracer, set_package_logger_handler
1919
from aws_lambda_powertools.logging import correlation_paths
20-
from aws_lambda_powertools.logging.exceptions import InvalidLoggerSamplingRateError, OrphanedChildLoggerError
20+
from aws_lambda_powertools.logging.exceptions import InvalidLoggerSamplingRateError
2121
from aws_lambda_powertools.logging.formatter import (
2222
BasePowertoolsFormatter,
2323
LambdaPowertoolsFormatter,
@@ -1176,63 +1176,3 @@ def test_logger_json_unicode(stdout, service_name):
11761176

11771177
assert log["message"] == non_ascii_chars
11781178
assert log[japanese_field] == japanese_string
1179-
1180-
1181-
def test_logger_registered_handler_is_custom_handler(service_name):
1182-
# GIVEN a library or environment pre-setup a logger for us using the same name (see #4277)
1183-
class ForeignHandler(logging.StreamHandler): ...
1184-
1185-
foreign_handler = ForeignHandler()
1186-
logging.getLogger(service_name).addHandler(foreign_handler)
1187-
1188-
# WHEN Logger init with a custom handler
1189-
custom_handler = logging.StreamHandler()
1190-
logger = Logger(service=service_name, logger_handler=custom_handler)
1191-
1192-
# THEN registered handler should always return what we provided
1193-
assert logger.registered_handler is not foreign_handler
1194-
assert logger.registered_handler is custom_handler
1195-
assert logger.logger_handler is custom_handler
1196-
assert logger.handlers == [foreign_handler, custom_handler]
1197-
1198-
1199-
def test_child_logger_registered_handler_is_custom_handler(service_name):
1200-
# GIVEN
1201-
class ForeignHandler(logging.StreamHandler): ...
1202-
1203-
foreign_handler = ForeignHandler()
1204-
logging.getLogger(service_name).addHandler(foreign_handler)
1205-
1206-
custom_handler = logging.StreamHandler()
1207-
custom_handler.name = "CUSTOM HANDLER"
1208-
parent = Logger(service=service_name, logger_handler=custom_handler)
1209-
1210-
# WHEN a child Logger init
1211-
child = Logger(service=service_name, child=True)
1212-
1213-
# THEN child registered handler should always return what we provided in the parent
1214-
assert child.registered_handler is not foreign_handler
1215-
assert child.registered_handler is custom_handler
1216-
assert child.registered_handler is parent.registered_handler
1217-
1218-
1219-
def test_logger_handler_is_created_despite_env_pre_setup(service_name):
1220-
# GIVEN a library or environment pre-setup a logger for us using the same name
1221-
environment_handler = logging.StreamHandler()
1222-
logging.getLogger(service_name).addHandler(environment_handler)
1223-
1224-
# WHEN Logger init without a custom handler
1225-
logger = Logger(service=service_name)
1226-
1227-
# THEN registered handler should be Powertools default handler, not env
1228-
assert logger.registered_handler is not environment_handler
1229-
1230-
1231-
def test_child_logger_append_keys_before_parent(stdout, service_name):
1232-
# GIVEN a child Logger is initialized before its/without parent
1233-
child = Logger(stream=stdout, service=service_name, child=True)
1234-
1235-
# WHEN a child Logger appends a key
1236-
# THEN it will raise an AttributeError
1237-
with pytest.raises(OrphanedChildLoggerError):
1238-
child.append_keys(customer_id="value")

0 commit comments

Comments
 (0)