Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ddtrace/_trace/_span_link.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ def _drop_attribute(self, key):

def to_dict(self):
d = {
"trace_id": "{:032x}".format(self.trace_id),
"span_id": "{:016x}".format(self.span_id),
"trace_id": f"{self.trace_id:032x}",
"span_id": f"{self.span_id:016x}",
}
if self.attributes:
d["attributes"] = {}
Expand Down
10 changes: 5 additions & 5 deletions ddtrace/_trace/context.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,9 @@ def _traceparent(self) -> str:
# grab the original traceparent trace id, not the converted value
trace_id = tp.split("-")[1]
else:
trace_id = "{:032x}".format(self.trace_id)
trace_id = f"{self.trace_id:032x}"

return "00-{}-{:016x}-{}".format(trace_id, self.span_id, self._traceflags)
return f"00-{trace_id}-{self.span_id:016x}-{self._traceflags}"

@property
def _traceflags(self) -> str:
Expand All @@ -175,12 +175,12 @@ def _tracestate(self) -> str:
# cut out the original dd list member from tracestate so we can replace it with the new one we created
ts_w_out_dd = re.sub("dd=(.+?)(?:,|$)", "", ts)
if ts_w_out_dd:
ts = "dd={},{}".format(dd_list_member, ts_w_out_dd)
ts = f"dd={dd_list_member},{ts_w_out_dd}"
else:
ts = "dd={}".format(dd_list_member)
ts = f"dd={dd_list_member}"
# if there is no original tracestate value then tracestate is just the dd list member we created
elif dd_list_member:
ts = "dd={}".format(dd_list_member)
ts = f"dd={dd_list_member}"
return ts

@property
Expand Down
9 changes: 3 additions & 6 deletions ddtrace/_trace/sampler.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,9 @@ def update_rate_by_service_sample_rates(self, rate_by_service: Dict[str, float])

def __str__(self):
rates = {key: sampler.sample_rate for key, sampler in self._agent_based_samplers.items()}
return "{}(agent_rates={!r}, limiter={!r}, rules={!r}), rate_limit_always_on={!r}".format(
self.__class__.__name__,
rates,
self.limiter,
self.rules,
self._rate_limit_always_on,
return (
f"{self.__class__.__name__}(agent_rates={rates!r}, limiter={self.limiter!r}, "
f"rules={self.rules!r}), rate_limit_always_on={self._rate_limit_always_on!r}"
)

__repr__ = __str__
Expand Down
2 changes: 1 addition & 1 deletion ddtrace/_trace/span.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def _get_64_lowest_order_bits_as_int(large_int: int) -> int:

def _get_64_highest_order_bits_as_hex(large_int: int) -> str:
"""Get the 64 highest order bits from a 128bit integer"""
return "{:032x}".format(large_int)[:16]
return f"{large_int:032x}"[:16]


class Span(object):
Expand Down
7 changes: 2 additions & 5 deletions ddtrace/_trace/trace_handlers.py
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ def _on_web_framework_finish_request(
status_code = int(status_code)
except ValueError:
pass
span.resource = "{} {}".format(method, status_code)
span.resource = f"{method} {status_code}"
trace_utils.set_http_meta(
span=span,
integration_config=int_config,
Expand Down Expand Up @@ -952,10 +952,7 @@ def _on_azure_message_modifier(
def _on_router_match(route):
req_span = core.get_item("req_span")
core.set_item("set_resource", False)
req_span.resource = "{} {}".format(
route.method,
route.template,
)
req_span.resource = f"{route.method} {route.template}"

MOLTEN_ROUTE = "molten.route"

Expand Down
Loading