Skip to content

Commit 7a12601

Browse files
committed
fix tests
1 parent a4b777e commit 7a12601

File tree

3 files changed

+20
-22
lines changed

3 files changed

+20
-22
lines changed

opentelemetry-api/src/opentelemetry/_logs/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
LogRecord,
4040
NoOpLogger,
4141
NoOpLoggerProvider,
42+
LoggerConfig,
4243
get_logger,
4344
get_logger_provider,
4445
set_logger_provider,
@@ -51,6 +52,7 @@
5152
"LogRecord",
5253
"NoOpLogger",
5354
"NoOpLoggerProvider",
55+
"LoggerConfig",
5456
"get_logger",
5557
"get_logger_provider",
5658
"set_logger_provider",

opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/__init__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14+
15+
# pylint: disable=too-many-lines
16+
1417
from __future__ import annotations
1518

1619
import abc

opentelemetry-sdk/tests/logs/test_logs.py

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
from opentelemetry.sdk.environment_variables import OTEL_SDK_DISABLED
3333
from opentelemetry.sdk.resources import Resource
3434
from opentelemetry.sdk.util.instrumentation import InstrumentationScope
35+
from opentelemetry.sdk._logs._internal import (
36+
create_logger_configurator_by_name,
37+
create_logger_configurator_with_pattern,
38+
)
3539

3640

3741
class TestLoggerProvider(unittest.TestCase):
@@ -426,10 +430,6 @@ def test_logger_configurator_behavior(self):
426430
"test.performance": LoggerConfig(trace_based=True),
427431
}
428432

429-
from opentelemetry.sdk._logs._internal import (
430-
create_logger_configurator_by_name, # pylint:disable=import-outside-toplevel
431-
)
432-
433433
configurator = create_logger_configurator_by_name(logger_configs)
434434

435435
provider = LoggerProvider(logger_configurator=configurator)
@@ -456,10 +456,6 @@ def test_logger_configurator_behavior(self):
456456

457457
def test_logger_configurator_pattern_matching(self):
458458
"""Test LoggerConfigurator with pattern matching"""
459-
from opentelemetry.sdk._logs._internal import (
460-
create_logger_configurator_with_pattern,
461-
)
462-
463459
patterns = [
464460
(
465461
"test.database.*",
@@ -495,10 +491,6 @@ def test_logger_configurator_dynamic_updates(self):
495491
"test.module": LoggerConfig(minimum_severity=SeverityNumber.INFO)
496492
}
497493

498-
from opentelemetry.sdk._logs._internal import (
499-
create_logger_configurator_by_name, # pylint:disable=import-outside-toplevel
500-
)
501-
502494
initial_configurator = create_logger_configurator_by_name(
503495
initial_configs
504496
)
@@ -547,19 +539,20 @@ def none_configurator(scope):
547539
self.assertTrue(logger.config.trace_based)
548540
self.assertFalse(logger.config.disabled)
549541

542+
@staticmethod
543+
def _selective_configurator(scope):
544+
if scope.name == "disabled.logger":
545+
return LoggerConfig(disabled=True)
546+
if scope.name == "error.logger":
547+
return LoggerConfig(minimum_severity=SeverityNumber.ERROR)
548+
if scope.name == "trace.logger":
549+
return LoggerConfig(trace_based=True)
550+
return LoggerConfig()
551+
550552
def test_logger_configurator_with_filtering(self):
551553
"""Test that LoggerConfigurator configs are properly applied during filtering"""
552554

553-
def selective_configurator(scope):
554-
if scope.name == "disabled.logger":
555-
return LoggerConfig(disabled=True)
556-
if scope.name == "error.logger":
557-
return LoggerConfig(minimum_severity=SeverityNumber.ERROR)
558-
if scope.name == "trace.logger":
559-
return LoggerConfig(trace_based=True)
560-
return LoggerConfig()
561-
562-
provider = LoggerProvider(logger_configurator=selective_configurator)
555+
provider = LoggerProvider(logger_configurator=self._selective_configurator)
563556

564557
disabled_logger = provider.get_logger("disabled.logger")
565558
log_record_processor_mock = Mock()

0 commit comments

Comments
 (0)