refactor!: convert all SDK timestamps from HrTime to bigint

experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusSerializer.ts

@@ -282,7 +282,7 @@ export class PrometheusSerializer {
 
     name = enforcePrometheusNamingConvention(name, data);
     const { value, attributes } = dataPoint;
-    const timestamp = nanosecondsToMilliseconds(dataPoint.endTime);
+    const timestamp = nanosecondsToMilliseconds(dataPoint.endTimeUnixNano);
     results += stringify(
       name,
       attributes,
@@ -303,7 +303,7 @@ export class PrometheusSerializer {
     name = enforcePrometheusNamingConvention(name, data);
     const attributes = dataPoint.attributes;
     const histogram = dataPoint.value;
-    const timestamp = nanosecondsToMilliseconds(dataPoint.endTime);
+    const timestamp = nanosecondsToMilliseconds(dataPoint.endTimeUnixNano);
     /** Histogram["bucket"] is not typed with `number` */
     for (const key of ['count', 'sum'] as ('count' | 'sum')[]) {
       const value = histogram[key];

experimental/packages/otlp-transformer/src/metrics/internal.ts

@@ -118,8 +118,8 @@ function toSingularDataPoint(
 ) {
   const out: INumberDataPoint = {
     attributes: toAttributes(dataPoint.attributes),
-    startTimeUnixNano: encoder.encodeBigIntNanos(dataPoint.startTime),
-    timeUnixNano: encoder.encodeBigIntNanos(dataPoint.endTime),
+    startTimeUnixNano: encoder.encodeBigIntNanos(dataPoint.startTimeUnixNano),
+    timeUnixNano: encoder.encodeBigIntNanos(dataPoint.endTimeUnixNano),
   };
 
   switch (valueType) {
@@ -161,8 +161,8 @@ function toHistogramDataPoints(
       sum: histogram.sum,
       min: histogram.min,
       max: histogram.max,
-      startTimeUnixNano: encoder.encodeBigIntNanos(dataPoint.startTime),
-      timeUnixNano: encoder.encodeBigIntNanos(dataPoint.endTime),
+      startTimeUnixNano: encoder.encodeBigIntNanos(dataPoint.startTimeUnixNano),
+      timeUnixNano: encoder.encodeBigIntNanos(dataPoint.endTimeUnixNano),
     };
   });
 }
@@ -189,8 +189,8 @@ function toExponentialHistogramDataPoints(
       },
       scale: histogram.scale,
       zeroCount: histogram.zeroCount,
-      startTimeUnixNano: encoder.encodeBigIntNanos(dataPoint.startTime),
-      timeUnixNano: encoder.encodeBigIntNanos(dataPoint.endTime),
+      startTimeUnixNano: encoder.encodeBigIntNanos(dataPoint.startTimeUnixNano),
+      timeUnixNano: encoder.encodeBigIntNanos(dataPoint.endTimeUnixNano),
     };
   });
 }

experimental/packages/otlp-transformer/test/logs.test.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { TraceFlags } from '@opentelemetry/api';
+import { HrTime, TraceFlags } from '@opentelemetry/api';
 import { InstrumentationScope } from '@opentelemetry/core';
 import { Resource, resourceFromAttributes } from '@opentelemetry/resources';
 import * as assert from 'assert';
@@ -183,6 +183,8 @@ describe('Logs', () => {
     const log_fragment_1 = {
       timeUnixNano: 1680253513123241635n,
       timeUnixNanoObserved: 1683526948965142784n,
+      hrTime: [1680253513, 123241635] as HrTime,
+      hrTimeObserved: [1683526948, 965142784] as HrTime,
       attributes: {
         'some-attribute': 'some attribute value',
       },
@@ -199,6 +201,8 @@ describe('Logs', () => {
     const log_fragment_2 = {
       timeUnixNano: 1680253797687038506n,
       timeUnixNanoObserved: 1680253797687038506n,
+      hrTime: [1680253797, 687038506] as HrTime,
+      hrTimeObserved: [1680253797, 687038506] as HrTime,
       attributes: {
         'another-attribute': 'another attribute value',
       },

experimental/packages/otlp-transformer/test/metrics.test.ts

@@ -122,8 +122,10 @@ describe('Metrics', () => {
       dataPoints: [
         {
           value: value,
-          startTime: START_TIME,
-          endTime: END_TIME,
+          startTimeUnixNano: START_TIME,
+          endTimeUnixNano: END_TIME,
+          startTime: [0, 0],
+          endTime: [0, 0],
           attributes: ATTRIBUTES,
         },
       ],
@@ -147,8 +149,10 @@ describe('Metrics', () => {
       dataPoints: [
         {
           value: value,
-          startTime: START_TIME,
-          endTime: END_TIME,
+          startTimeUnixNano: START_TIME,
+          endTimeUnixNano: END_TIME,
+          startTime: [0, 0],
+          endTime: [0, 0],
           attributes: ATTRIBUTES,
         },
       ],
@@ -172,8 +176,10 @@ describe('Metrics', () => {
       dataPoints: [
         {
           value: value,
-          startTime: START_TIME,
-          endTime: END_TIME,
+          startTimeUnixNano: START_TIME,
+          endTimeUnixNano: END_TIME,
+          startTime: [0, 0],
+          endTime: [0, 0],
           attributes: ATTRIBUTES,
         },
       ],
@@ -197,8 +203,10 @@ describe('Metrics', () => {
       dataPoints: [
         {
           value: value,
-          startTime: START_TIME,
-          endTime: END_TIME,
+          startTimeUnixNano: START_TIME,
+          endTimeUnixNano: END_TIME,
+          startTime: [0, 0],
+          endTime: [0, 0],
           attributes: ATTRIBUTES,
         },
       ],
@@ -218,8 +226,10 @@ describe('Metrics', () => {
       dataPoints: [
         {
           value: value,
-          startTime: START_TIME,
-          endTime: END_TIME,
+          startTimeUnixNano: START_TIME,
+          endTimeUnixNano: END_TIME,
+          startTime: [0, 0],
+          endTime: [0, 0],
           attributes: ATTRIBUTES,
         },
       ],
@@ -256,8 +266,10 @@ describe('Metrics', () => {
               counts: counts,
             },
           },
-          startTime: START_TIME,
-          endTime: END_TIME,
+          startTimeUnixNano: START_TIME,
+          endTimeUnixNano: END_TIME,
+          startTime: [0, 0],
+          endTime: [0, 0],
           attributes: ATTRIBUTES,
         },
       ],
@@ -296,8 +308,10 @@ describe('Metrics', () => {
             positive: positive,
             negative: negative,
           },
-          startTime: START_TIME,
-          endTime: END_TIME,
+          startTimeUnixNano: START_TIME,
+          endTimeUnixNano: END_TIME,
+          startTime: [0, 0],
+          endTime: [0, 0],
           attributes: ATTRIBUTES,
         },
       ],

experimental/packages/otlp-transformer/test/trace.test.ts

@@ -256,6 +256,7 @@ describe('Trace', () => {
         {
           name: 'some event',
           timeUnixNano: 1640715558542725388n,
+          time: [0, 0],
           attributes: {
             'event-attribute': 'some string value',
           },

experimental/packages/sdk-logs/src/LogRecord.ts

@@ -17,14 +17,19 @@
 import { AttributeValue, diag } from '@opentelemetry/api';
 import type * as logsAPI from '@opentelemetry/api-logs';
 import * as api from '@opentelemetry/api';
-import { isAttributeValue, InstrumentationScope } from '@opentelemetry/core';
+import {
+  isAttributeValue,
+  InstrumentationScope,
+  nanosToHrTime,
+} from '@opentelemetry/core';
 import type { Resource } from '@opentelemetry/resources';
 
 import type { ReadableLogRecord } from './export/ReadableLogRecord';
 import type { LogRecordLimits } from './types';
 import { AnyValue, LogAttributes, LogBody } from '@opentelemetry/api-logs';
 import { LoggerProviderSharedState } from './internal/LoggerProviderSharedState';
-import { timeInputToNano } from '@opentelemetry/core/src/common/time';
+import { timeInputToNano } from '@opentelemetry/core';
+import { HrTime } from '@opentelemetry/api';
 
 export class LogRecord implements ReadableLogRecord {
   readonly timeUnixNano: bigint;
@@ -75,6 +80,14 @@
     return this.totalAttributesCount - Object.keys(this.attributes).length;
   }
 
+  get hrTime(): HrTime {
+    return nanosToHrTime(this.timeUnixNano);
+  }
+
+  get hrTimeObserved(): HrTime {
+    return nanosToHrTime(this.timeUnixNanoObserved);
+  }
+
   constructor(
     _sharedState: LoggerProviderSharedState,
     instrumentationScope: InstrumentationScope,

experimental/packages/sdk-logs/src/export/ReadableLogRecord.ts

@@ -15,7 +15,7 @@
  */
 
 import type { Resource } from '@opentelemetry/resources';
-import type { SpanContext } from '@opentelemetry/api';
+import type { HrTime, SpanContext } from '@opentelemetry/api';
 import type { InstrumentationScope } from '@opentelemetry/core';
 import type {
   LogBody,
@@ -26,6 +26,10 @@ import type {
 export interface ReadableLogRecord {
   readonly timeUnixNano: bigint;
   readonly timeUnixNanoObserved: bigint;
+  /** @deprecated please use timeUnixNano */
+  readonly hrTime: HrTime;
+  /** @deprecated please use timeUnixNanoObserved */
+  readonly hrTimeObserved: HrTime;
   readonly spanContext?: SpanContext;
   readonly severityText?: string;
   readonly severityNumber?: SeverityNumber;

experimental/packages/sdk-logs/test/common/LogRecord.test.ts

@@ -40,7 +40,7 @@ import {
   millisecondsToNanoseconds,
   timeInputToNano,
   getTimeOrigin,
-} from '@opentelemetry/core/src/common/time';
+} from '@opentelemetry/core';
 
 const setup = (logRecordLimits?: LogRecordLimits, data?: logsAPI.LogRecord) => {
   const instrumentationScope = {

experimental/packages/shim-opencensus/src/metric-transform.ts

@@ -15,7 +15,7 @@
  */
 
 import * as oc from '@opencensus/core';
-import { Attributes, ValueType, diag } from '@opentelemetry/api';
+import { Attributes, HrTime, ValueType, diag } from '@opentelemetry/api';
 import { hrTimeToNanoseconds } from '@opentelemetry/core';
 import {
   AggregationTemporality,
@@ -169,24 +169,34 @@
     const attributes = zipOcLabels(metric.descriptor.labelKeys, ts.labelValues);
 
     // use zeroed hrTime if it is undefined, which probably shouldn't happen
-    const startTime = ocTimestampToHrTime(ts.startTimestamp) ?? 0n;
+    const startTimeUnixNano = ocTimestampToNanos(ts.startTimestamp) ?? 0n;
+    const startTime = ocTimestampToHrTime(ts.startTimestamp) ?? [0, 0];
 
     // points should be an array with a single value, so this will return a single point per
     // attribute set.
     return ts.points.map(
       (point): DataPoint<T> => ({
+        startTimeUnixNano,
         startTime,
         attributes,
         value: valueMapper(point.value),
-        endTime: ocTimestampToHrTime(point.timestamp) ?? 0n,
+        endTimeUnixNano: ocTimestampToNanos(point.timestamp) ?? 0n,
+        endTime: ocTimestampToHrTime(point.timestamp) ?? [0, 0],
       })
     );
   });
 }
 
-function ocTimestampToHrTime(ts: oc.Timestamp | undefined): bigint | null {
+function ocTimestampToHrTime(ts: oc.Timestamp | undefined): HrTime | null {
+  if (ts === undefined || ts.seconds === null) {
+    return null;
+  }
+  return [ts.seconds, ts.nanos ?? 0];
+}
+
+function ocTimestampToNanos(ts: oc.Timestamp | undefined): bigint | null {
   if (ts === undefined || ts.seconds === null) {
     return null;
   }
   return hrTimeToNanoseconds([ts.seconds, ts.nanos ?? 0]);
 }

experimental/packages/shim-opencensus/test/ShimSpan.test.ts

@@ -66,7 +66,7 @@ describe('ShimSpan', () => {
       });
 
       assert.strictEqual(span.events.length, 1);
-      const [{ timeUnixNano, ...event }] = span.events;
+      const [{ timeUnixNano, time, ...event }] = span.events;
       assert.deepStrictEqual(event, {
         attributes: {
           foo: 'bar',
@@ -85,7 +85,7 @@ describe('ShimSpan', () => {
       });
 
       assert.strictEqual(span.events.length, 1);
-      const [{ timeUnixNano, ...event }] = span.events;
+      const [{ timeUnixNano, time, ...event }] = span.events;
       assert.deepStrictEqual(event, {
         attributes: {
           'message.event.size.compressed': 15,

experimental/packages/shim-opencensus/test/metric-transform.test.ts

@@ -55,8 +55,10 @@ describe('metric-transform', () => {
       dataPoints: [
         {
           attributes: { key1: 'value1', key2: 'value2' },
-          endTime: 20_000_000_020n,
-          startTime: 10_000_000_010n,
+          endTimeUnixNano: 20_000_000_020n,
+          startTimeUnixNano: 10_000_000_010n,
+          startTime: [10, 10],
+          endTime: [20, 20],
           value: 5,
         },
       ],
@@ -97,8 +99,10 @@ describe('metric-transform', () => {
       dataPoints: [
         {
           attributes: { key1: 'value1', key2: 'value2' },
-          endTime: 20_000_000_020n,
-          startTime: 10_000_000_010n,
+          endTimeUnixNano: 20_000_000_020n,
+          startTimeUnixNano: 10_000_000_010n,
+          startTime: [10, 10],
+          endTime: [20, 20],
           value: 5.5,
         },
       ],
@@ -159,8 +163,10 @@ describe('metric-transform', () => {
       dataPoints: [
         {
           attributes: { key1: 'value1', key2: 'value2' },
-          endTime: 20_000_000_020n,
-          startTime: 10_000_000_010n,
+          endTimeUnixNano: 20_000_000_020n,
+          startTimeUnixNano: 10_000_000_010n,
+          startTime: [10, 10],
+          endTime: [20, 20],
           value: {
             buckets: {
               boundaries: [1, 10, 100],
@@ -207,8 +213,10 @@ describe('metric-transform', () => {
       dataPoints: [
         {
           attributes: { key1: 'value1', key2: 'value2' },
-          endTime: 20_000_000_020n,
-          startTime: 10_000_000_010n,
+          endTimeUnixNano: 20_000_000_020n,
+          startTimeUnixNano: 10_000_000_010n,
+          startTime: [10, 10],
+          endTime: [20, 20],
           value: 5,
         },
       ],
@@ -248,8 +256,10 @@ describe('metric-transform', () => {
       dataPoints: [
         {
           attributes: { key1: 'value1', key2: 'value2' },
-          endTime: 20_000_000_020n,
-          startTime: 10_000_000_010n,
+          endTimeUnixNano: 20_000_000_020n,
+          startTimeUnixNano: 10_000_000_010n,
+          startTime: [10, 10],
+          endTime: [20, 20],
           value: 5.5,
         },
       ],

packages/opentelemetry-core/src/common/time.ts

@@ -142,18 +142,18 @@
     return BigInt(millis) * 1_000_000n;
   } else {
     const out =
-      BigInt(Math.round(millis)) * 1000000n +
+      BigInt(Math.trunc(millis)) * 1000000n +
       BigInt(Math.round((millis % 1) * 1000000));
     return out;
   }
 }
 
 export function nanosecondsToMilliseconds(nanos: bigint): number {
   return Number(nanos / 1_000_000n);
 }
 
 export function nanosecondsToMicroseconds(nanos: bigint): number {
   return Number(nanos / 1_000n);
 }
 
 export function nanosToHrTime(nanos: bigint): api.HrTime {

packages/opentelemetry-core/test/common/time.test.ts

@@ -240,6 +240,7 @@ describe('time', () => {
         millisecondsToNanoseconds(123.123_456_789),
         123_123_457n
       );
+      assert.strictEqual(millisecondsToNanoseconds(1066.969834), 1066969834n);
     });
   });