Update formatting to fix warnings

NathanielRN · Oct 23, 2020 · 4568baf · 4568baf
1 parent 870edc2
commit 4568baf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg b/sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg
@@ -39,15 +39,15 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-api == 0.14.dev0
+    opentelemetry-api == 0.14.b0
 
 [options.entry_points]
 opentelemetry_propagator =
     aws_xray = opentelemetry.sdk.extension.aws.trace.propagation.aws_xray_format:AWSXRayFormat
 
 [options.extras_require]
 test =
-    opentelemetry-test == 0.14.dev0
+    opentelemetry-test == 0.14.b0
 
 [options.packages.find]
 where = src
diff --git a/...dk-extension-aws/src/opentelemetry/sdk/extension/aws/trace/propagation/aws_xray_format.py b/...dk-extension-aws/src/opentelemetry/sdk/extension/aws/trace/propagation/aws_xray_format.py
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import typing
-from re import compile as re_compile
 
 import logging
 import opentelemetry.trace as trace
@@ -64,7 +63,7 @@ def extract(
         context: typing.Optional[Context] = None,
     ) -> Context:
         if not carrier:
-            raise ValueError('Could not extract from carrier: %s'.format(carrier))
+            raise ValueError(("Could not extract from carrier: %s", carrier))
 
         trace_header = get_from_carrier(carrier, self.TRACE_HEADER_KEY)
 
@@ -74,7 +73,6 @@ def extract(
         trace_id = trace.INVALID_TRACE_ID
         span_id = trace.INVALID_SPAN_ID
         sampled = False
-        flags = None
 
         next_kv_pair_start = 0
 
@@ -83,34 +81,34 @@ def extract(
                 kv_pair_delimiter_index = trace_header.index(self.KV_PAIR_DELIMITER, next_kv_pair_start)
                 kv_pair_subset = trace_header[next_kv_pair_start:kv_pair_delimiter_index]
                 next_kv_pair_start = kv_pair_delimiter_index + 1
-            except ValueError as e:
+            except ValueError as _:
                 kv_pair_subset = trace_header[next_kv_pair_start:]
                 next_kv_pair_start = len(trace_header)
 
             stripped_kv_pair = kv_pair_subset.strip()
 
             try:
                 key_and_value_delimiter_index = stripped_kv_pair.index(self.KEY_AND_VALUE_DELIMITER)
-            except ValueError as e:
-                _logger.error("Error parsing X-Ray trace header. Invalid key value pair: %s. Returning INVALID span context.".format(kv_pair_subset))
+            except ValueError as _:
+                _logger.error(("Error parsing X-Ray trace header. Invalid key value pair: %s. Returning INVALID span context.", kv_pair_subset))
                 return trace.set_span_in_context(trace.INVALID_SPAN)
 
             value = stripped_kv_pair[key_and_value_delimiter_index + 1:]
 
-            if (stripped_kv_pair.startswith(self.TRACE_ID_KEY)):
+            if stripped_kv_pair.startswith(self.TRACE_ID_KEY):
                 if (len(value) != self.TRACE_ID_LENGTH or
                     not value.startswith(self.TRACE_ID_VERSION) or
                     value[self.TRACE_ID_DELIMITER_INDEX_1] != self.TRACE_ID_DELIMITER or
                     value[self.TRACE_ID_DELIMITER_INDEX_2] != self.TRACE_ID_DELIMITER):
-                    _logger.error("Invalid TraceId in X-Ray trace header: '%s' with value '%s'. Returning INVALID span context.".format(self.TRACE_HEADER_KEY, trace_header))
+                    _logger.error(("Invalid TraceId in X-Ray trace header: '%s' with value '%s'. Returning INVALID span context.", self.TRACE_HEADER_KEY, trace_header))
                     return trace.INVALID_SPAN_CONTEXT
 
                 timestamp_subset = value[self.TRACE_ID_DELIMITER_INDEX_1 + 1: self.TRACE_ID_DELIMITER_INDEX_2]
                 unique_id_subset = value[self.TRACE_ID_DELIMITER_INDEX_2 + 1: self.TRACE_ID_LENGTH]
                 trace_id = int(timestamp_subset + unique_id_subset, 16)
             elif stripped_kv_pair.startswith(self.PARENT_ID_KEY):
                 if len(value) != self.PARENT_ID_LENGTH:
-                    _logger.error("Invalid ParentId in X-Ray trace header: '%s' with value '%s'. Returning INVALID span context.".format(self.TRACE_HEADER_KEY, trace_header))
+                    _logger.error(("Invalid ParentId in X-Ray trace header: '%s' with value '%s'. Returning INVALID span context.", self.TRACE_HEADER_KEY, trace_header))
                     return trace.INVALID_SPAN_CONTEXT
 
                 span_id = int(value, 16)
@@ -130,7 +128,7 @@ def extract(
                         is_sampled_flag_valid = False
 
                 if not is_sampled_flag_valid:
-                    _logger.error("Invalid Sampling flag in X-Ray trace header: '%s' with value '%s'. Returning INVALID span context.".format(self.TRACE_HEADER_KEY, trace_header))
+                    _logger.error(("Invalid Sampling flag in X-Ray trace header: '%s' with value '%s'. Returning INVALID span context.", self.TRACE_HEADER_KEY, trace_header))
                     return trace.INVALID_SPAN_CONTEXT
 
         options = 0
@@ -162,7 +160,7 @@ def inject(
         context: typing.Optional[Context] = None,
     ) -> None:
         if not carrier:
-            raise ValueError('Could not extract from carrier: %s'.format(carrier))
+            raise ValueError(("Could not extract from carrier: %s", carrier))
 
         span = trace.get_current_span(context=context)
 

diff --git a/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/version.py b/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.14.dev0"
+__version__ = "0.14.b0"