Skip to content

Commit

Permalink
Fix conflict issues
Browse files Browse the repository at this point in the history
  • Loading branch information
shalevr committed Aug 30, 2022
1 parent f5369ed commit 7e01f9e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ def client_resposne_hook(span, future):
http_status_to_status_code,
unwrap,
)
from opentelemetry.metrics import Histogram, get_meter
from opentelemetry.metrics import get_meter
from opentelemetry.propagators import textmap
from opentelemetry.semconv.trace import SpanAttributes
from opentelemetry.trace.status import Status, StatusCode
Expand Down Expand Up @@ -407,7 +407,7 @@ def _get_full_handler_name(handler):


def _start_span(self, handler) -> _TraceContext:
start_time_ns = _time_ns()
start_time_ns = time_ns()
start_time = default_timer()

span, token = _start_internal_or_server_span(
Expand Down Expand Up @@ -468,7 +468,7 @@ def _finish_span(self, handler, error=None):
if isinstance(error, tornado.web.HTTPError):
status_code = error.status_code
if not ctx and status_code == 404:
ctx = _start_span(self, handler, _time_ns())
ctx = _start_span(self, handler)
else:
status_code = 500
reason = None
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def fetch_async(
args,
kwargs,
):
start_time = _time_ns()
start_time = time_ns()

# Return immediately if no args were provided (error)
# or original_request is set (meaning we are in a redirect step).
Expand Down

0 comments on commit 7e01f9e

Please sign in to comment.