Skip to content
This repository has been archived by the owner on Oct 19, 2023. It is now read-only.

Commit

Permalink
Let the OTel implementation create event timestamps
Browse files Browse the repository at this point in the history
Let the OTel implementation create event timestamps instead of
generating a timestamp in the shim, i.e. outside of OpenTelemetry.
  • Loading branch information
johananl committed Oct 11, 2019
1 parent ddf0978 commit 4cbf3dd
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import opentracing

from opentelemetry.ext.opentracingshim import util
from opentelemetry.trace import Event

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -77,11 +76,10 @@ def log_kv(self, key_values, timestamp=None):
if timestamp is not None:
event_timestamp = util.time_seconds_to_ns(timestamp)
else:
event_timestamp = util.time_ns()
event_timestamp = None

event_name = util.event_name_from_kv(key_values)
event = Event(event_name, event_timestamp, key_values)
self._otel_span.add_lazy_event(event)
self._otel_span.add_event(event_name, event_timestamp, key_values)

# Return self for call chaining.
return self
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import time

try:
time_ns = time.time_ns
# Python versions < 3.7
except AttributeError:

def time_ns():
return int(time.time() * 1e9)


# A default event name to be used for logging events when a better event name
# can't be derived from the event's key-value pairs.
DEFAULT_EVENT_NAME = "log"
Expand Down
3 changes: 2 additions & 1 deletion ext/opentelemetry-ext-opentracing-shim/tests/test_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import unittest

from opentelemetry.ext.opentracingshim import util
from opentelemetry.util import time_ns


class TestUtil(unittest.TestCase):
Expand Down Expand Up @@ -44,7 +45,7 @@ def test_time_seconds_to_ns(self):
self.assertEqual(result, int(time_seconds * 1e9))

def test_time_seconds_from_ns(self):
time_nanoseconds = util.time_ns()
time_nanoseconds = time_ns()
result = util.time_seconds_from_ns(time_nanoseconds)

self.assertEqual(result, time_nanoseconds / 1e9)
Expand Down

0 comments on commit 4cbf3dd

Please sign in to comment.