diff --git a/docs/conf.py b/docs/conf.py index 965a806d06a..611effb999a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -47,7 +47,7 @@ # -- Project information ----------------------------------------------------- project = "OpenTelemetry Python" -copyright = "OpenTelemetry Authors" # pylint: disable=redefined-builtin +_copyright = "OpenTelemetry Authors" # pylint: disable=redefined-builtin author = "OpenTelemetry Authors" diff --git a/opentelemetry-api/src/opentelemetry/baggage/__init__.py b/opentelemetry-api/src/opentelemetry/baggage/__init__.py index 9a740200a6f..776faefa78d 100644 --- a/opentelemetry-api/src/opentelemetry/baggage/__init__.py +++ b/opentelemetry-api/src/opentelemetry/baggage/__init__.py @@ -121,8 +121,8 @@ def _is_valid_value(value: object) -> bool: parts = str(value).split(";") is_valid_value = _VALUE_PATTERN.fullmatch(parts[0]) is not None if len(parts) > 1: # one or more properties metadata - for property in parts[1:]: - if _PROPERT_PATTERN.fullmatch(property) is None: + for _property in parts[1:]: + if _PROPERT_PATTERN.fullmatch(_property) is None: is_valid_value = False break return is_valid_value diff --git a/opentelemetry-sdk/tests/metrics/test_exemplarfilter.py b/opentelemetry-sdk/tests/metrics/test_exemplarfilter.py index daca0e60618..0f3feef567b 100644 --- a/opentelemetry-sdk/tests/metrics/test_exemplarfilter.py +++ b/opentelemetry-sdk/tests/metrics/test_exemplarfilter.py @@ -13,14 +13,16 @@ class TestAlwaysOnExemplarFilter(TestCase): def test_should_sample(self): - filter = AlwaysOnExemplarFilter() - self.assertTrue(filter.should_sample(10, 0, {}, Context())) + self.assertTrue( + AlwaysOnExemplarFilter().should_sample(10, 0, {}, Context()) + ) class TestAlwaysOffExemplarFilter(TestCase): def test_should_sample(self): - filter = AlwaysOffExemplarFilter() - self.assertFalse(filter.should_sample(10, 0, {}, Context())) + self.assertFalse( + AlwaysOffExemplarFilter().should_sample(10, 0, {}, Context()) + ) class TestTraceBasedExemplarFilter(TestCase): @@ -28,7 +30,6 @@ class TestTraceBasedExemplarFilter(TestCase): SPAN_ID = int("6e0c63257de34c92", 16) def test_should_not_sample_without_trace(self): - filter = TraceBasedExemplarFilter() span_context = SpanContext( trace_id=self.TRACE_ID, span_id=self.SPAN_ID, @@ -38,14 +39,16 @@ def test_should_not_sample_without_trace(self): ) span = trace.NonRecordingSpan(span_context) ctx = trace.set_span_in_context(span) - self.assertFalse(filter.should_sample(10, 0, {}, ctx)) + self.assertFalse( + TraceBasedExemplarFilter().should_sample(10, 0, {}, ctx) + ) def test_should_not_sample_with_invalid_span(self): - filter = TraceBasedExemplarFilter() - self.assertFalse(filter.should_sample(10, 0, {}, Context())) + self.assertFalse( + TraceBasedExemplarFilter().should_sample(10, 0, {}, Context()) + ) def test_should_sample_when_trace_is_sampled(self): - filter = TraceBasedExemplarFilter() span_context = SpanContext( trace_id=self.TRACE_ID, span_id=self.SPAN_ID, @@ -55,4 +58,6 @@ def test_should_sample_when_trace_is_sampled(self): ) span = trace.NonRecordingSpan(span_context) ctx = trace.set_span_in_context(span) - self.assertTrue(filter.should_sample(10, 0, {}, ctx)) + self.assertTrue( + TraceBasedExemplarFilter().should_sample(10, 0, {}, ctx) + ) diff --git a/pyproject.toml b/pyproject.toml index ab84e2d398d..a342a73401e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,6 +31,7 @@ select = [ "PLC", # pylint convention "PLE", # pylint error "Q", # flake8-quotes + "A", # flake8-builtins ] ignore = [ diff --git a/shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/__init__.py b/shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/__init__.py index a06d7834722..cb349e0fc6d 100644 --- a/shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/__init__.py +++ b/shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/__init__.py @@ -684,7 +684,7 @@ def start_span( context = SpanContextShim(span.get_span_context()) return SpanShim(self, context, span) - def inject(self, span_context, format: object, carrier: object): + def inject(self, span_context, _format: object, carrier: object): """Injects ``span_context`` into ``carrier``. See base class for more details. @@ -703,7 +703,7 @@ def inject(self, span_context, format: object, carrier: object): # TODO: Support Format.BINARY once it is supported in # opentelemetry-python. - if format not in self._supported_formats: + if _format not in self._supported_formats: raise UnsupportedFormatException propagator = get_global_textmap() @@ -715,7 +715,7 @@ def inject(self, span_context, format: object, carrier: object): ctx = set_span_in_context(span) propagator.inject(carrier, context=ctx) - def extract(self, format: object, carrier: object): + def extract(self, _format: object, carrier: object): """Returns an ``opentracing.SpanContext`` instance extracted from a ``carrier``. @@ -737,7 +737,7 @@ def extract(self, format: object, carrier: object): # uses the configured propagators in opentelemetry.propagators. # TODO: Support Format.BINARY once it is supported in # opentelemetry-python. - if format not in self._supported_formats: + if _format not in self._supported_formats: raise UnsupportedFormatException propagator = get_global_textmap()