Sourcery Starbot ⭐ refactored AlfiyaZi/jaeger-client-python #1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
SourceryAI
commented
Feb 17, 2021
Comment on lines
-143
to
+146
| self._processMap = {} | ||
| self._processMap["startTrace"] = Processor.process_startTrace | ||
| self._processMap["joinTrace"] = Processor.process_joinTrace | ||
| self._processMap = { | ||
| "startTrace": Processor.process_startTrace, | ||
| "joinTrace": Processor.process_joinTrace, | ||
| } |
Author
There was a problem hiding this comment.
Function Processor.__init__ refactored with the following changes:
- Merge dictionary assignment with declaration (
merge-dict-assign)
Comment on lines
-149
to
+160
| if name not in self._processMap: | ||
| iprot.skip(TType.STRUCT) | ||
| iprot.readMessageEnd() | ||
| x = TApplicationException(TApplicationException.UNKNOWN_METHOD, 'Unknown function %s' % (name)) | ||
| oprot.writeMessageBegin(name, TMessageType.EXCEPTION, seqid) | ||
| x.write(oprot) | ||
| oprot.writeMessageEnd() | ||
| oprot.trans.flush() | ||
| return | ||
| else: | ||
| if name in self._processMap: | ||
| return self._processMap[name](self, seqid, iprot, oprot) | ||
|
|
||
| iprot.skip(TType.STRUCT) | ||
| iprot.readMessageEnd() | ||
| x = TApplicationException(TApplicationException.UNKNOWN_METHOD, 'Unknown function %s' % (name)) | ||
| oprot.writeMessageBegin(name, TMessageType.EXCEPTION, seqid) | ||
| x.write(oprot) | ||
| oprot.writeMessageEnd() | ||
| oprot.trans.flush() | ||
| return |
Author
There was a problem hiding this comment.
Function Processor.process refactored with the following changes:
- Swap if/else branches (
swap-if-else-branches) - Remove unnecessary else after guard condition (
remove-unnecessary-else)
Comment on lines
-211
to
+214
| if fid == 1: | ||
| if ftype == TType.STRUCT: | ||
| self.request = StartTraceRequest() | ||
| self.request.read(iprot) | ||
| else: | ||
| iprot.skip(ftype) | ||
| if fid == 1 and ftype == TType.STRUCT: | ||
| self.request = StartTraceRequest() | ||
| self.request.read(iprot) |
Author
There was a problem hiding this comment.
Function startTrace_args.read refactored with the following changes:
- Merge duplicate blocks in conditional (
merge-duplicate-blocks)
| iprot.skip(ftype) | ||
| if fid == 0 and ftype == TType.STRUCT: | ||
| self.success = TraceResponse() | ||
| self.success.read(iprot) |
Author
There was a problem hiding this comment.
Function startTrace_result.read refactored with the following changes:
- Merge duplicate blocks in conditional (
merge-duplicate-blocks)
Comment on lines
-342
to
+339
| if fid == 1: | ||
| if ftype == TType.STRUCT: | ||
| self.request = JoinTraceRequest() | ||
| self.request.read(iprot) | ||
| else: | ||
| iprot.skip(ftype) | ||
| if fid == 1 and ftype == TType.STRUCT: | ||
| self.request = JoinTraceRequest() | ||
| self.request.read(iprot) |
Author
There was a problem hiding this comment.
Function joinTrace_args.read refactored with the following changes:
- Merge duplicate blocks in conditional (
merge-duplicate-blocks)
| for key in tags.keys(): | ||
| tag_name_list.append(key) | ||
| return tag_name_list | ||
| return [key for key in tags.keys()] |
Author
There was a problem hiding this comment.
Function PrometheusMetricsFactory._get_tag_name_list refactored with the following changes:
- Convert for loop into list comprehension (
list-comprehension) - Inline variable that is immediately returned (
inline-immediately-returned-variable)
Comment on lines
-113
to
+116
| self._processMap = {} | ||
| self._processMap["emitZipkinBatch"] = Processor.process_emitZipkinBatch | ||
| self._processMap["emitBatch"] = Processor.process_emitBatch | ||
| self._processMap = { | ||
| "emitZipkinBatch": Processor.process_emitZipkinBatch, | ||
| "emitBatch": Processor.process_emitBatch, | ||
| } |
Author
There was a problem hiding this comment.
Function Processor.__init__ refactored with the following changes:
- Merge dictionary assignment with declaration (
merge-dict-assign)
Comment on lines
-119
to
+130
| if name not in self._processMap: | ||
| iprot.skip(TType.STRUCT) | ||
| iprot.readMessageEnd() | ||
| x = TApplicationException(TApplicationException.UNKNOWN_METHOD, 'Unknown function %s' % (name)) | ||
| oprot.writeMessageBegin(name, TMessageType.EXCEPTION, seqid) | ||
| x.write(oprot) | ||
| oprot.writeMessageEnd() | ||
| oprot.trans.flush() | ||
| return | ||
| else: | ||
| if name in self._processMap: | ||
| return self._processMap[name](self, seqid, iprot, oprot) | ||
|
|
||
| iprot.skip(TType.STRUCT) | ||
| iprot.readMessageEnd() | ||
| x = TApplicationException(TApplicationException.UNKNOWN_METHOD, 'Unknown function %s' % (name)) | ||
| oprot.writeMessageBegin(name, TMessageType.EXCEPTION, seqid) | ||
| x.write(oprot) | ||
| oprot.writeMessageEnd() | ||
| oprot.trans.flush() | ||
| return |
Author
There was a problem hiding this comment.
Function Processor.process refactored with the following changes:
- Swap if/else branches (
swap-if-else-branches) - Remove unnecessary else after guard condition (
remove-unnecessary-else)
Comment on lines
-171
to
+179
| if fid == 1: | ||
| if ftype == TType.LIST: | ||
| self.spans = [] | ||
| (_etype3, _size0) = iprot.readListBegin() | ||
| for _i4 in xrange(_size0): | ||
| _elem5 = zipkincore.ttypes.Span() | ||
| _elem5.read(iprot) | ||
| self.spans.append(_elem5) | ||
| iprot.readListEnd() | ||
| else: | ||
| iprot.skip(ftype) | ||
| if fid == 1 and ftype == TType.LIST: | ||
| self.spans = [] | ||
| (_etype3, _size0) = iprot.readListBegin() | ||
| for _i4 in xrange(_size0): | ||
| _elem5 = zipkincore.ttypes.Span() | ||
| _elem5.read(iprot) | ||
| self.spans.append(_elem5) | ||
| iprot.readListEnd() |
Author
There was a problem hiding this comment.
Function emitZipkinBatch_args.read refactored with the following changes:
- Merge duplicate blocks in conditional (
merge-duplicate-blocks)
| iprot.skip(ftype) | ||
| if fid == 1 and ftype == TType.STRUCT: | ||
| self.batch = jaeger.ttypes.Batch() | ||
| self.batch.read(iprot) |
Author
There was a problem hiding this comment.
Function emitBatch_args.read refactored with the following changes:
- Merge duplicate blocks in conditional (
merge-duplicate-blocks)
SourceryAI
commented
Feb 17, 2021
| self._handler = handler | ||
| self._processMap = {} | ||
| self._processMap["submitBatches"] = Processor.process_submitBatches | ||
| self._processMap = {"submitBatches": Processor.process_submitBatches} |
Author
There was a problem hiding this comment.
Function Processor.__init__ refactored with the following changes:
- Merge dictionary assignment with declaration (
merge-dict-assign)
Comment on lines
-111
to
+120
| if name not in self._processMap: | ||
| iprot.skip(TType.STRUCT) | ||
| iprot.readMessageEnd() | ||
| x = TApplicationException(TApplicationException.UNKNOWN_METHOD, 'Unknown function %s' % (name)) | ||
| oprot.writeMessageBegin(name, TMessageType.EXCEPTION, seqid) | ||
| x.write(oprot) | ||
| oprot.writeMessageEnd() | ||
| oprot.trans.flush() | ||
| return | ||
| else: | ||
| if name in self._processMap: | ||
| return self._processMap[name](self, seqid, iprot, oprot) | ||
|
|
||
| iprot.skip(TType.STRUCT) | ||
| iprot.readMessageEnd() | ||
| x = TApplicationException(TApplicationException.UNKNOWN_METHOD, 'Unknown function %s' % (name)) | ||
| oprot.writeMessageBegin(name, TMessageType.EXCEPTION, seqid) | ||
| x.write(oprot) | ||
| oprot.writeMessageEnd() | ||
| oprot.trans.flush() | ||
| return |
Author
There was a problem hiding this comment.
Function Processor.process refactored with the following changes:
- Swap if/else branches (
swap-if-else-branches) - Remove unnecessary else after guard condition (
remove-unnecessary-else)
Comment on lines
-161
to
+167
| if fid == 1: | ||
| if ftype == TType.LIST: | ||
| self.batches = [] | ||
| (_etype45, _size42) = iprot.readListBegin() | ||
| for _i46 in xrange(_size42): | ||
| _elem47 = Batch() | ||
| _elem47.read(iprot) | ||
| self.batches.append(_elem47) | ||
| iprot.readListEnd() | ||
| else: | ||
| iprot.skip(ftype) | ||
| if fid == 1 and ftype == TType.LIST: | ||
| self.batches = [] | ||
| (_etype45, _size42) = iprot.readListBegin() | ||
| for _i46 in xrange(_size42): | ||
| _elem47 = Batch() | ||
| _elem47.read(iprot) | ||
| self.batches.append(_elem47) | ||
| iprot.readListEnd() |
Author
There was a problem hiding this comment.
Function submitBatches_args.read refactored with the following changes:
- Merge duplicate blocks in conditional (
merge-duplicate-blocks)
Comment on lines
-234
to
+237
| if fid == 0: | ||
| if ftype == TType.LIST: | ||
| self.success = [] | ||
| (_etype52, _size49) = iprot.readListBegin() | ||
| for _i53 in xrange(_size49): | ||
| _elem54 = BatchSubmitResponse() | ||
| _elem54.read(iprot) | ||
| self.success.append(_elem54) | ||
| iprot.readListEnd() | ||
| else: | ||
| iprot.skip(ftype) | ||
| if fid == 0 and ftype == TType.LIST: | ||
| self.success = [] | ||
| (_etype52, _size49) = iprot.readListBegin() | ||
| for _i53 in xrange(_size49): | ||
| _elem54 = BatchSubmitResponse() | ||
| _elem54.read(iprot) | ||
| self.success.append(_elem54) | ||
| iprot.readListEnd() |
Author
There was a problem hiding this comment.
Function submitBatches_result.read refactored with the following changes:
- Merge duplicate blocks in conditional (
merge-duplicate-blocks)
Comment on lines
-232
to
+243
| if fid == 1: | ||
| if ftype == TType.I64: | ||
| self.timestamp = iprot.readI64() | ||
| else: | ||
| iprot.skip(ftype) | ||
| elif fid == 2: | ||
| if ftype == TType.LIST: | ||
| self.fields = [] | ||
| (_etype3, _size0) = iprot.readListBegin() | ||
| for _i4 in xrange(_size0): | ||
| _elem5 = Tag() | ||
| _elem5.read(iprot) | ||
| self.fields.append(_elem5) | ||
| iprot.readListEnd() | ||
| else: | ||
| iprot.skip(ftype) | ||
| else: | ||
| if fid == 1 and ftype == TType.I64: | ||
| self.timestamp = iprot.readI64() | ||
| elif ftype != TType.LIST or fid != 2: | ||
| iprot.skip(ftype) | ||
| else: | ||
| self.fields = [] | ||
| (_etype3, _size0) = iprot.readListBegin() | ||
| for _i4 in xrange(_size0): | ||
| _elem5 = Tag() | ||
| _elem5.read(iprot) | ||
| self.fields.append(_elem5) | ||
| iprot.readListEnd() |
Author
There was a problem hiding this comment.
Function Log.read refactored with the following changes:
- Merge duplicate blocks in conditional (
merge-duplicate-blocks) - Remove redundant conditional (
remove-redundant-if)
| self._handler = handler | ||
| self._processMap = {} | ||
| self._processMap["submitZipkinBatch"] = Processor.process_submitZipkinBatch | ||
| self._processMap = {"submitZipkinBatch": Processor.process_submitZipkinBatch} |
Author
There was a problem hiding this comment.
Function Processor.__init__ refactored with the following changes:
- Merge dictionary assignment with declaration (
merge-dict-assign)
Comment on lines
-111
to
+120
| if name not in self._processMap: | ||
| iprot.skip(TType.STRUCT) | ||
| iprot.readMessageEnd() | ||
| x = TApplicationException(TApplicationException.UNKNOWN_METHOD, 'Unknown function %s' % (name)) | ||
| oprot.writeMessageBegin(name, TMessageType.EXCEPTION, seqid) | ||
| x.write(oprot) | ||
| oprot.writeMessageEnd() | ||
| oprot.trans.flush() | ||
| return | ||
| else: | ||
| if name in self._processMap: | ||
| return self._processMap[name](self, seqid, iprot, oprot) | ||
|
|
||
| iprot.skip(TType.STRUCT) | ||
| iprot.readMessageEnd() | ||
| x = TApplicationException(TApplicationException.UNKNOWN_METHOD, 'Unknown function %s' % (name)) | ||
| oprot.writeMessageBegin(name, TMessageType.EXCEPTION, seqid) | ||
| x.write(oprot) | ||
| oprot.writeMessageEnd() | ||
| oprot.trans.flush() | ||
| return |
Author
There was a problem hiding this comment.
Function Processor.process refactored with the following changes:
- Swap if/else branches (
swap-if-else-branches) - Remove unnecessary else after guard condition (
remove-unnecessary-else)
Comment on lines
-161
to
+167
| if fid == 1: | ||
| if ftype == TType.LIST: | ||
| self.spans = [] | ||
| (_etype17, _size14) = iprot.readListBegin() | ||
| for _i18 in xrange(_size14): | ||
| _elem19 = Span() | ||
| _elem19.read(iprot) | ||
| self.spans.append(_elem19) | ||
| iprot.readListEnd() | ||
| else: | ||
| iprot.skip(ftype) | ||
| if fid == 1 and ftype == TType.LIST: | ||
| self.spans = [] | ||
| (_etype17, _size14) = iprot.readListBegin() | ||
| for _i18 in xrange(_size14): | ||
| _elem19 = Span() | ||
| _elem19.read(iprot) | ||
| self.spans.append(_elem19) | ||
| iprot.readListEnd() |
Author
There was a problem hiding this comment.
Function submitZipkinBatch_args.read refactored with the following changes:
- Merge duplicate blocks in conditional (
merge-duplicate-blocks)
Comment on lines
-234
to
+237
| if fid == 0: | ||
| if ftype == TType.LIST: | ||
| self.success = [] | ||
| (_etype24, _size21) = iprot.readListBegin() | ||
| for _i25 in xrange(_size21): | ||
| _elem26 = Response() | ||
| _elem26.read(iprot) | ||
| self.success.append(_elem26) | ||
| iprot.readListEnd() | ||
| else: | ||
| iprot.skip(ftype) | ||
| if fid == 0 and ftype == TType.LIST: | ||
| self.success = [] | ||
| (_etype24, _size21) = iprot.readListBegin() | ||
| for _i25 in xrange(_size21): | ||
| _elem26 = Response() | ||
| _elem26.read(iprot) | ||
| self.success.append(_elem26) | ||
| iprot.readListEnd() |
Author
There was a problem hiding this comment.
Function submitZipkinBatch_result.read refactored with the following changes:
- Merge duplicate blocks in conditional (
merge-duplicate-blocks)
Comment on lines
-653
to
+654
| if fid == 1: | ||
| if ftype == TType.BOOL: | ||
| self.ok = iprot.readBool() | ||
| else: | ||
| iprot.skip(ftype) | ||
| if fid == 1 and ftype == TType.BOOL: | ||
| self.ok = iprot.readBool() |
Author
There was a problem hiding this comment.
Function Response.read refactored with the following changes:
- Merge duplicate blocks in conditional (
merge-duplicate-blocks)
SourceryAI
commented
Feb 17, 2021
Comment on lines
-170
to
+174
| good_headers_bad_values = { | ||
| 'Trace-ID': '100:7f:0:1xxx', | ||
| 'trace-attr-Kiff': 'Amy' | ||
| } | ||
| with self.assertRaises(SpanContextCorruptedException): | ||
| good_headers_bad_values = { | ||
| 'Trace-ID': '100:7f:0:1xxx', | ||
| 'trace-attr-Kiff': 'Amy' | ||
| } |
Author
There was a problem hiding this comment.
Function TestCodecs.test_context_from_bad_readable_headers refactored with the following changes:
- Move assignments closer to their usage (
move-assign)
Comment on lines
-191
to
+202
| codec = tracer.codecs[Format.HTTP_HEADERS] | ||
| headers = { | ||
| 'Trace-ID': '100%3A7f:0:1', | ||
| 'trace-attr-Kiff': 'Amy%20Wang', | ||
| 'trace-atTR-HERMES': 'LaBarbara%20Hermes' | ||
| } | ||
| else: | ||
| codec = tracer.codecs[Format.HTTP_HEADERS] | ||
| headers = { | ||
| 'Trace-ID': '100:7f:0:1', | ||
| 'trace-attr-Kiff': 'Amy Wang', | ||
| 'trace-atTR-HERMES': 'LaBarbara Hermes' | ||
| } | ||
| codec = tracer.codecs[Format.HTTP_HEADERS] |
Author
There was a problem hiding this comment.
Function TestCodecs.test_context_from_readable_headers refactored with the following changes:
- Hoist repeated code outside conditional statement (
hoist-statement-from-if)
Comment on lines
-499
to
+498
| carrier = dict() | ||
| carrier = {} |
Author
There was a problem hiding this comment.
Function test_inject_with_128bit_trace_id refactored with the following changes:
- Replace dict() with {} (
dict-literal)
Comment on lines
-85
to
+108
| level3 = dict() | ||
| level3['serviceName'] = 'python' | ||
| level3['serverRole'] = 's3' | ||
| level3['transport'] = s3_transport | ||
| level3['host'] = 'localhost' | ||
| level3['port'] = str(http_port) if s3_transport == 'HTTP' else tchannel_port | ||
|
|
||
| level2 = dict() | ||
| level2['serviceName'] = 'python' | ||
| level2['serverRole'] = 's2' | ||
| level2['transport'] = s2_transport | ||
| level2['host'] = 'localhost' | ||
| level2['port'] = str(http_port) if s2_transport == 'HTTP' else tchannel_port | ||
| level2['downstream'] = level3 | ||
|
|
||
| level1 = dict() | ||
| level1['baggage'] = 'Zoidberg' | ||
| level1['serverRole'] = 's1' | ||
| level1['sampled'] = sampled | ||
| level1['downstream'] = level2 | ||
| level3 = { | ||
| 'serviceName': 'python', | ||
| 'serverRole': 's3', | ||
| 'transport': s3_transport, | ||
| 'host': 'localhost', | ||
| 'port': str(http_port) if s3_transport == 'HTTP' else tchannel_port, | ||
| } | ||
|
|
||
| level2 = { | ||
| 'serviceName': 'python', | ||
| 'serverRole': 's2', | ||
| 'transport': s2_transport, | ||
| 'host': 'localhost', | ||
| 'port': str(http_port) if s2_transport == 'HTTP' else tchannel_port, | ||
| 'downstream': level3, | ||
| } | ||
|
|
||
| level1 = { | ||
| 'baggage': 'Zoidberg', | ||
| 'serverRole': 's1', | ||
| 'sampled': sampled, | ||
| 'downstream': level2, | ||
| } | ||
|
|
Author
There was a problem hiding this comment.
Function test_trace_propagation refactored with the following changes:
- Replace dict() with {} (
dict-literal) - Merge dictionary assignment with declaration (
merge-dict-assign)
Comment on lines
-137
to
+141
| payload = dict() | ||
| payload['operation'] = 'Zoidberg' | ||
| payload['count'] = 2 | ||
| payload['tags'] = {'key': 'value'} | ||
| payload = {'operation': 'Zoidberg', 'count': 2, 'tags': {'key': 'value'}} |
Author
There was a problem hiding this comment.
Function test_endtoend_handler refactored with the following changes:
- Replace dict() with {} (
dict-literal) - Merge dictionary assignment with declaration (
merge-dict-assign)
| sampler.rate_limiter.last_tick = ts | ||
| with mock.patch('jaeger_client.rate_limiter.RateLimiter.timestamp') \ | ||
| as mock_time: | ||
| as mock_time: |
Author
There was a problem hiding this comment.
Function test_rate_limiting_sampler refactored with the following changes:
- Replace range(0, x) with range(x) (
remove-zero-from-range) - Replace unused for index with underscore (
for-index-underscore)
Comment on lines
-124
to
+126
| args=args if args else [], | ||
| args=args or [], | ||
| expected=expected, | ||
| kwargs=kwargs if kwargs else {}, | ||
| kwargs=kwargs or {}, |
Author
There was a problem hiding this comment.
Function test_span_logging.test refactored with the following changes:
- Simplify if expression by using or (
or-if-exp-identity)
Comment on lines
-203
to
+205
| span = 'span' | ||
| carrier = {} | ||
| with pytest.raises(ValueError): | ||
| span = 'span' | ||
| carrier = {} |
Author
There was a problem hiding this comment.
Function test_serialization_error refactored with the following changes:
- Move assignments closer to their usage (
move-assign)
Comment on lines
-290
to
+295
| codecs = { | ||
| 'extra_codec': 'codec_placeholder', | ||
| Format.BINARY: 'overridden_binary_codec' | ||
|
|
||
| } | ||
| with mock.patch('socket.gethostname', return_value='dream-host.com'): | ||
| codecs = { | ||
| 'extra_codec': 'codec_placeholder', | ||
| Format.BINARY: 'overridden_binary_codec' | ||
|
|
||
| } |
Author
There was a problem hiding this comment.
Function test_tracer_override_codecs refactored with the following changes:
- Move assignments closer to their usage (
move-assign)
|
|
||
| def _generate_spans(tracer, iterations=1000, sleep=None): | ||
| for i in range(0, iterations): | ||
| for _ in range(iterations): |
Author
There was a problem hiding this comment.
Function _generate_spans refactored with the following changes:
- Replace range(0, x) with range(x) (
remove-zero-from-range) - Replace unused for index with underscore (
for-index-underscore)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Thanks for starring sourcery-ai/sourcery ✨ 🌟 ✨
Here's your pull request refactoring your most popular Python repo.
If you want Sourcery to refactor all your Python repos and incoming pull requests install our bot.
Review changes via command line
To manually merge these changes, make sure you're on the
masterbranch, then run: