Sourcery refactored master branch by sourcery-ai[bot] · Pull Request #1 · Prhmma/opencensus-python

sourcery-ai · 2023-11-01T12:45:49Z

Branch master refactored by Sourcery.

If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.

See our documentation here.

Run Sourcery locally

Reduce the feedback loop during development by using the Sourcery editor plugin:

Review changes via command line

To manually merge these changes, make sure you're on the master branch, then run:

git fetch origin sourcery/master
git merge --ff-only FETCH_HEAD
git reset HEAD^

Help us improve this pull request!

sourcery-ai

Due to GitHub API limits, only the first 60 comments can be shown.

sourcery-ai · 2023-11-01T12:45:51Z

-                    self.name,
-                    self.parent,
-                ))
+        return f'{type(self).__name__}(name={self.name}, parent={self.parent})'


Function Span.__repr__ refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2023-11-01T12:45:51Z

-            i,
-            RuntimeContext,
-        ))
+        print(f'Hello {name} {i} {RuntimeContext}')


Function hello refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2023-11-01T12:45:51Z


    def __repr__(self):
-        return ('{}({})'.format(type(self).__name__, self.name))
+        return f'{type(self).__name__}({self.name})'


Function Span.__repr__ refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2023-11-01T12:45:51Z

-    println('Entering worker[{}]: {}'.format(name, RuntimeContext))
+    println(f'Entering worker[{name}]: {RuntimeContext}')
    RuntimeContext.operation_id = name
    time.sleep(0.01)
-    println('Exiting worker[{}]: {}'.format(name, RuntimeContext))
+    println(f'Exiting worker[{name}]: {RuntimeContext}')


Function work refactored with the following changes:

Replace call to format with f-string [×2] (use-fstring-for-formatting)

sourcery-ai · 2023-11-01T12:45:51Z


 if __name__ == "__main__":
-    println('Main thread: {}'.format(RuntimeContext))
+    println(f'Main thread: {RuntimeContext}')


Lines 38-50 refactored with the following changes:

Replace call to format with f-string [×2] (use-fstring-for-formatting)

sourcery-ai · 2023-11-01T12:45:52Z

        if fullpath.endswith('.lock'):
            fullpath = fullpath[: fullpath.rindex('@')]
-        fullpath += '@{}.lock'.format(_fmt(timestamp))
+        fullpath += f'@{_fmt(timestamp)}.lock'


Function LocalFileBlob.lease refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2023-11-01T12:45:52Z

            interval=self.maintenance_period,
            function=self._maintenance_routine,
-            name='{} Storage Worker'.format(source)
+            name=f'{source} Storage Worker',


Function LocalFileStorage.__init__ refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2023-11-01T12:45:52Z

            pass
        try:
-            for blob in self.gets():
+            for _ in self.gets():


Function LocalFileStorage._maintenance_routine refactored with the following changes:

Replace unused for index with underscore (for-index-underscore)

sourcery-ai · 2023-11-01T12:45:53Z

            if self.options.credential:
                token = self.options.credential.get_token(_MONITOR_OAUTH_SCOPE)
-                headers["Authorization"] = "Bearer {}".format(token.token)
+                headers["Authorization"] = f"Bearer {token.token}"


Function TransportMixin._transmit refactored with the following changes:

Replace call to format with f-string [×2] (use-fstring-for-formatting)

Merge else clause's nested if statement into elif [×3] (merge-else-if-into-elif)

Use named expression to simplify assignment and conditional (use-named-expression)

Swap positions of nested conditionals (swap-nested-ifs)

sourcery-ai · 2023-11-01T12:45:53Z

-        if type_name == "success" or type_name == "count":  # success, count
+        if type_name in ["success", "count"]:  # success, count


Function _update_requests_map refactored with the following changes:

Replace multiple comparisons of same variable with in operator (merge-comparisons)

sourcery-ai · 2023-11-01T12:45:55Z

-        opencensus_version,
-        ext_version,
-    ),
+    'ai.internal.sdkVersion': f'py{platform.python_version()}:oc{opencensus_version}:ext{ext_version}',


Lines 33-37 refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2023-11-01T12:45:55Z

-        super(Worker, self).__init__(
-            name='{} Worker'.format(type(dst).__name__)
-        )
+        super(Worker, self).__init__(name=f'{type(dst).__name__} Worker')


Function Worker.__init__ refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2023-11-01T12:45:55Z

-            level = 0
            has_full_stack = False
-            exc_type = "N/A"
            message = self.format(record)
            if tb is not None:
                has_full_stack = True
-                for fileName, line, method, _text in traceback.extract_tb(tb):
-                    callstack.append({
+                callstack.extend(
+                    {
                        'level': level,
                        'method': method,
                        'fileName': fileName,
                        'line': line,
-                    })
-                    level += 1
+                    }
+                    for level, (fileName, line, method, _text) in enumerate(
+                        traceback.extract_tb(tb)
+                    )
+                )
                callstack.reverse()
            elif record.message:
                message = record.message

-            if exctype is not None:
-                exc_type = exctype.__name__
-
+            exc_type = exctype.__name__ if exctype is not None else "N/A"


Function AzureLogHandler.log_record_to_envelope refactored with the following changes:

Move assignments closer to their usage (move-assign)

Move assignment closer to its usage within a block (move-assign-in-block)

Replace manual loop counter with call to enumerate (convert-to-enumerate)

Replace a for append loop with list extend (for-append-to-extend)

Move setting of default value for variable into else branch (introduce-default-else)

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2023-11-01T12:45:55Z

-    envelope.tags['ai.operation.parentId'] = '|{}.{}.'.format(
-        envelope.tags['ai.operation.id'],
-        getattr(record, 'spanId', '0000000000000000'),
-    )
+    envelope.tags[
+        'ai.operation.parentId'
+    ] = f"|{envelope.tags['ai.operation.id']}.{getattr(record, 'spanId', '0000000000000000')}."


Function create_envelope refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2023-11-01T12:45:55Z

        if self.exporter_thread:
-            # flush if metrics exporter is not for stats
-            if not self._is_stats:
-                self.exporter_thread.close()
-            else:
+            if self._is_stats:
                self.exporter_thread.cancel()


Function MetricsExporter.shutdown refactored with the following changes:

Swap positions of nested conditionals [×2] (swap-nested-ifs)

Hoist nested repeated code outside conditional statements [×2] (hoist-similar-statement-from-if)

Swap if/else branches (swap-if-else-branches)

This removes the following comments ( why? ):

# flush if metrics exporter is not for stats

sourcery-ai · 2023-11-01T12:45:56Z

-            envelope.tags['ai.operation.parentId'] = '{}'.format(
-                sd.parent_span_id,
-            )
+            envelope.tags['ai.operation.parentId'] = f'{sd.parent_span_id}'


Function AzureExporter.span_data_to_envelope refactored with the following changes:

Replace call to format with f-string [×3] (use-fstring-for-formatting)

Use f-string instead of string concatenation [×2] (use-fstring-for-concatenation)

Convert for loop into list comprehension (list-comprehension)

This removes the following comments ( why? ):

# TODO # Modify based off attributes or status

sourcery-ai · 2023-11-01T12:45:56Z


-    mm = metric.Metric(descriptor=desc, time_series=ts)
-    return mm
+    return metric.Metric(descriptor=desc, time_series=ts)


Function create_metric refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2023-11-01T12:45:56Z

-    mm = metric.Metric(descriptor=desc, time_series=ts)
-    return mm
+    return metric.Metric(descriptor=desc, time_series=ts)


Function create_metric_ts refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2023-11-01T12:45:57Z

-    mm = metric.Metric(descriptor=desc, time_series=ts)
-    return mm
+    return metric.Metric(descriptor=desc, time_series=ts)


Function create_stats_metric refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2023-11-01T12:45:57Z

        _requests_map.clear()
-        _requests_map['failure'] = {}
-        _requests_map['failure'][400] = 10
+        _requests_map['failure'] = {400: 10}


Function TestStatsbeatMetrics.test_get_failure_count_value refactored with the following changes:

Merge dictionary assignment with declaration (merge-dict-assign)

sourcery-ai · 2023-11-01T12:45:59Z

-        _requests_map['retry'] = {}
-        _requests_map['retry'][401] = 10
+        _requests_map['retry'] = {401: 10}


Function TestStatsbeatMetrics.test_get_retry_count_value refactored with the following changes:

Merge dictionary assignment with declaration (merge-dict-assign)

sourcery-ai · 2023-11-01T12:45:59Z

-        _requests_map['throttle'] = {}
-        _requests_map['throttle'][402] = 10
+        _requests_map['throttle'] = {402: 10}


Function TestStatsbeatMetrics.test_get_throttle_count_value refactored with the following changes:

Merge dictionary assignment with declaration (merge-dict-assign)

sourcery-ai · 2023-11-01T12:45:59Z

-        _requests_map['exception'] = {}
-        _requests_map['exception']['Timeout'] = 10
+        _requests_map['exception'] = {'Timeout': 10}


Function TestStatsbeatMetrics.test_get_exception_count_value refactored with the following changes:

Merge dictionary assignment with declaration (merge-dict-assign)

sourcery-ai · 2023-11-01T12:45:59Z

-        _vm_data = {}
-        _vm_data["vmId"] = "123"
-        _vm_data["subscriptionId"] = "sub123"
-        _vm_data["osType"] = "linux"
+        _vm_data = {"vmId": "123", "subscriptionId": "sub123", "osType": "linux"}


Function TestStatsbeatMetrics.test_get_attach_metric_vm refactored with the following changes:

Merge dictionary assignment with declaration [×3] (merge-dict-assign)

sourcery-ai · 2023-11-01T12:45:59Z

-        _vm_data = {}
-        _vm_data["vmId"] = "123"
-        _vm_data["subscriptionId"] = "sub123"
-        _vm_data["osType"] = None
+        _vm_data = {"vmId": "123", "subscriptionId": "sub123", "osType": None}


Function TestStatsbeatMetrics.test_get_attach_metric_vm_no_os refactored with the following changes:

Merge dictionary assignment with declaration [×3] (merge-dict-assign)

sourcery-ai · 2023-11-01T12:46:00Z


    span = tracer.start_span()
-    span.name = '{}.query'.format(vendor)
+    span.name = f'{vendor}.query'


Function _trace_db_call refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2023-11-01T12:46:00Z

        trace_id = '2dd43a1d6b2549c6bc2a1a54c2fc0b05'
        span_id = '6e0c63257de34c92'
-        django_trace_id = '00-{}-{}-00'.format(trace_id, span_id)
+        django_trace_id = f'00-{trace_id}-{span_id}-00'


Function TestOpencensusMiddleware.test_process_request refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2023-11-01T12:46:00Z

        trace_id = '2dd43a1d6b2549c6bc2a1a54c2fc0b05'
        span_id = '6e0c63257de34c92'
-        django_trace_id = '00-{}-{}-00'.format(trace_id, span_id)
+        django_trace_id = f'00-{trace_id}-{span_id}-00'


Function TestOpencensusMiddleware.test_process_response refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2023-11-01T12:46:00Z

        trace_id = '2dd43a1d6b2549c6bc2a1a54c2fc0b05'
        span_id = '6e0c63257de34c92'
-        django_trace_id = '00-{}-{}-00'.format(trace_id, span_id)
+        django_trace_id = f'00-{trace_id}-{span_id}-00'


Function TestOpencensusMiddleware.test_process_response_unfinished_child_span refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2023-11-01T12:46:01Z

        trace_id = '2dd43a1d6b2549c6bc2a1a54c2fc0b05'
        span_id = '6e0c63257de34c92'
-        django_trace_id = '00-{}-{}-00'.format(trace_id, span_id)
+        django_trace_id = f'00-{trace_id}-{span_id}-00'


Function TestOpencensusMiddleware.test_process_exception refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

'Refactored by Sourcery'

250d384

sourcery-ai Bot requested a review from Prhmma November 1, 2023 12:45

sourcery-ai Bot commented Nov 1, 2023

View reviewed changes

		if type_name == "success" or type_name == "count": # success, count
		if type_name in ["success", "count"]: # success, count

Conversation

sourcery-ai Bot commented Nov 1, 2023

Uh oh!

sourcery-ai Bot left a comment

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Nov 1, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Nov 1, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Nov 1, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Nov 1, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Nov 1, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Nov 1, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Nov 1, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Nov 1, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Nov 1, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Nov 1, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Nov 1, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Nov 1, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Nov 1, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Nov 1, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Nov 1, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Nov 1, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Nov 1, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Nov 1, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Nov 1, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Nov 1, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Nov 1, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Nov 1, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Nov 1, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Nov 1, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Nov 1, 2023

Choose a reason for hiding this comment