forked from open-telemetry/opentelemetry-collector
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move timestamp functions to pdata package
This is necessary to prevent circular package dependency that can arise when we need to hide certain pdata functions in the internal package in a commit that is coming soon in open-telemetry#1703
- Loading branch information
Tigran Najaryan
committed
Sep 1, 2020
1 parent
274fb4e
commit 932d2cd
Showing
10 changed files
with
126 additions
and
50 deletions.
There are no files selected for viewing
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| // Copyright The OpenTelemetry Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package pdata | ||
|
|
||
| import ( | ||
| "time" | ||
|
|
||
| "google.golang.org/protobuf/types/known/timestamppb" | ||
| ) | ||
|
|
||
| func TimestampToUnixNano(ts *timestamppb.Timestamp) (t TimestampUnixNano) { | ||
| if ts == nil { | ||
| return | ||
| } | ||
| return TimestampUnixNano(uint64(ts.AsTime().UnixNano())) | ||
| } | ||
|
|
||
| func UnixNanoToTimestamp(u TimestampUnixNano) *timestamppb.Timestamp { | ||
| // 0 is a special case and want to make sure we return nil. | ||
| if u == 0 { | ||
| return nil | ||
| } | ||
| return timestamppb.New(UnixNanoToTime(u)) | ||
| } | ||
|
|
||
| func UnixNanoToTime(u TimestampUnixNano) time.Time { | ||
| // 0 is a special case and want to make sure we return a time that IsZero() returns true. | ||
| if u == 0 { | ||
| return time.Time{} | ||
| } | ||
| return time.Unix(0, int64(u)).UTC() | ||
| } |
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| // Copyright The OpenTelemetry Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package pdata | ||
|
|
||
| import ( | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| "google.golang.org/protobuf/types/known/timestamppb" | ||
| ) | ||
|
|
||
| func TestUnixNanosConverters(t *testing.T) { | ||
| t1 := time.Date(2020, 03, 24, 1, 13, 23, 789, time.UTC) | ||
| tun := TimestampUnixNano(t1.UnixNano()) | ||
|
|
||
| assert.EqualValues(t, uint64(1585012403000000789), tun) | ||
| tp := UnixNanoToTimestamp(tun) | ||
| assert.EqualValues(t, ×tamppb.Timestamp{Seconds: 1585012403, Nanos: 789}, tp) | ||
| assert.EqualValues(t, tun, TimestampToUnixNano(tp)) | ||
| } | ||
|
|
||
| func TestZeroTimestamps(t *testing.T) { | ||
| assert.Zero(t, TimestampToUnixNano(nil)) | ||
| assert.Nil(t, UnixNanoToTimestamp(0)) | ||
| assert.True(t, UnixNanoToTime(0).IsZero()) | ||
| } |
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Oops, something went wrong.