Use standard way to convert from time.Time to proto Timestamp (#2548)

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
open-telemetry · Mar 5, 2021 · 040c856 · 040c856
1 parent 8b68f72
commit 040c856
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 4 deletions.
diff --git a/exporter/carbonexporter/exporter_test.go b/exporter/carbonexporter/exporter_test.go
@@ -38,6 +38,7 @@ import (
 	"go.opentelemetry.io/collector/testutil/metricstestutil"
 	"go.opentelemetry.io/collector/translator/internaldata"
 	"go.uber.org/zap"
+	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
 func TestNew(t *testing.T) {
@@ -299,7 +300,7 @@ func generateLargeBatch() pdata.Metrics {
 					time.Now(),
 					[]string{"v0", "v1"},
 					&metricspb.Point{
-						Timestamp: metricstestutil.Timestamp(ts),
+						Timestamp: timestamppb.New(ts),
 						Value:     &metricspb.Point_Int64Value{Int64Value: int64(i)},
 					},
 				),

diff --git a/exporter/carbonexporter/go.mod b/exporter/carbonexporter/go.mod
@@ -8,4 +8,5 @@ require (
 	go.opentelemetry.io/collector v0.21.1-0.20210303005052-9c476019fc0f
 	go.uber.org/zap v1.16.0
 	google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect
+	google.golang.org/protobuf v1.25.0
 )
diff --git a/exporter/carbonexporter/metricdata_to_plaintext_test.go b/exporter/carbonexporter/metricdata_to_plaintext_test.go
@@ -25,6 +25,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/testutil/metricstestutil"
 	"go.opentelemetry.io/collector/translator/internaldata"
+	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
 func Test_sanitizeTagKey(t *testing.T) {
@@ -154,7 +155,7 @@ func Test_metricDataToPlaintext(t *testing.T) {
 	int64Val := int64(123)
 	expectedInt64ValStr := "123"
 	int64Pt := &metricspb.Point{
-		Timestamp: metricstestutil.Timestamp(tsUnix),
+		Timestamp: timestamppb.New(tsUnix),
 		Value:     &metricspb.Point_Int64Value{Int64Value: int64Val},
 	}
 

diff --git a/exporter/splunkhecexporter/exporter_test.go b/exporter/splunkhecexporter/exporter_test.go
@@ -38,6 +38,7 @@ import (
 	"go.opentelemetry.io/collector/translator/conventions"
 	"go.opentelemetry.io/collector/translator/internaldata"
 	"go.uber.org/zap"
+	"google.golang.org/protobuf/types/known/timestamppb"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk"
 )
@@ -181,7 +182,7 @@ func generateLargeBatch() internaldata.MetricsData {
 					time.Now(),
 					[]string{"v0", "v1"},
 					&metricspb.Point{
-						Timestamp: metricstestutil.Timestamp(ts),
+						Timestamp: timestamppb.New(ts),
 						Value:     &metricspb.Point_Int64Value{Int64Value: int64(i)},
 					},
 				),

diff --git a/exporter/splunkhecexporter/go.mod b/exporter/splunkhecexporter/go.mod
@@ -9,6 +9,7 @@ require (
 	go.opentelemetry.io/collector v0.21.1-0.20210303005052-9c476019fc0f
 	go.uber.org/zap v1.16.0
 	google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect
+	google.golang.org/protobuf v1.25.0
 
 )
 

diff --git a/receiver/awsecscontainermetricsreceiver/awsecscontainermetrics/utils.go b/receiver/awsecscontainermetricsreceiver/awsecscontainermetrics/utils.go
@@ -23,6 +23,7 @@ import (
 	"github.com/golang/protobuf/ptypes/timestamp"
 	"go.opentelemetry.io/collector/testutil/metricstestutil"
 	"go.opentelemetry.io/collector/translator/internaldata"
+	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
 // GenerateDummyMetrics generates two dummy metrics
@@ -46,7 +47,7 @@ func createGaugeIntMetric(i int) *metricspb.Metric {
 			time.Now(),
 			[]string{"label_value_0", "label_value_1"},
 			&metricspb.Point{
-				Timestamp: metricstestutil.Timestamp(ts),
+				Timestamp: timestamppb.New(ts),
 				Value:     &metricspb.Point_Int64Value{Int64Value: int64(i)},
 			},
 		),

diff --git a/receiver/awsecscontainermetricsreceiver/go.mod b/receiver/awsecscontainermetricsreceiver/go.mod
@@ -8,4 +8,5 @@ require (
 	github.com/stretchr/testify v1.7.0
 	go.opentelemetry.io/collector v0.21.1-0.20210303005052-9c476019fc0f
 	go.uber.org/zap v1.16.0
+	google.golang.org/protobuf v1.25.0
 )