Update core to latest, fix breaking change [Start|End]Time -> [Start|…

…End]Timestamp (#2954) Signed-off-by: Bogdan Drutu <[email protected]>
open-telemetry · Mar 31, 2021 · 92c8edd · 92c8edd
1 parent 7b87813
commit 92c8edd
Show file tree

Hide file tree

Showing 181 changed files with 324 additions and 326 deletions.
diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/gogo/protobuf v1.3.2
 	github.com/pelletier/go-toml v1.8.0 // indirect
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/collector v0.23.1-0.20210331155714-fe86ab5cba6d
+	go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15
 	go.uber.org/zap v1.16.0
 	gopkg.in/ini.v1 v1.57.0 // indirect
 )
diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum
@@ -907,8 +907,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.23.1-0.20210331155714-fe86ab5cba6d h1:dKUPQciOVKguQyhUUZ8h0Jw1LtrNOeDUh5DY05rX398=
-go.opentelemetry.io/collector v0.23.1-0.20210331155714-fe86ab5cba6d/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM=
+go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM=
+go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice.go b/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice.go
@@ -72,7 +72,7 @@ func resourceSpansToLogServiceData(resourceSpans pdata.ResourceSpans) []*sls.Log
 }
 
 func spanToLogServiceData(span pdata.Span, resourceContents, instrumentationLibraryContents []*sls.LogContent) *sls.Log {
-	timeNano := int64(span.EndTime())
+	timeNano := int64(span.EndTimestamp())
 	if timeNano == 0 {
 		timeNano = time.Now().UnixNano()
 	}
@@ -124,15 +124,15 @@ func spanToLogServiceData(span pdata.Span, resourceContents, instrumentationLibr
 	})
 	contentsBuffer = append(contentsBuffer, sls.LogContent{
 		Key:   proto.String(startTimeField),
-		Value: proto.String(strconv.FormatUint(uint64(span.StartTime()/1000), 10)),
+		Value: proto.String(strconv.FormatUint(uint64(span.StartTimestamp()/1000), 10)),
 	})
 	contentsBuffer = append(contentsBuffer, sls.LogContent{
 		Key:   proto.String(endTimeField),
-		Value: proto.String(strconv.FormatUint(uint64(span.EndTime()/1000), 10)),
+		Value: proto.String(strconv.FormatUint(uint64(span.EndTimestamp()/1000), 10)),
 	})
 	contentsBuffer = append(contentsBuffer, sls.LogContent{
 		Key:   proto.String(durationField),
-		Value: proto.String(strconv.FormatUint(uint64((span.EndTime()-span.StartTime())/1000), 10)),
+		Value: proto.String(strconv.FormatUint(uint64((span.EndTimestamp()-span.StartTimestamp())/1000), 10)),
 	})
 	attributeMap := tracetranslator.AttributeMapToMap(span.Attributes())
 	attributeJSONBytes, _ := json.Marshal(attributeMap)

diff --git a/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice_test.go b/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice_test.go
@@ -123,8 +123,8 @@ func fillHTTPClientSpan(span pdata.Span) {
 	span.SetParentSpanID(newSegmentID())
 	span.SetName("/users/junit")
 	span.SetKind(pdata.SpanKindCLIENT)
-	span.SetStartTime(pdata.TimestampFromTime(startTime))
-	span.SetEndTime(pdata.TimestampFromTime(endTime))
+	span.SetStartTimestamp(pdata.TimestampFromTime(startTime))
+	span.SetEndTimestamp(pdata.TimestampFromTime(endTime))
 	span.SetTraceState("x:y")
 
 	span.Events().Resize(1)
@@ -158,8 +158,8 @@ func fillHTTPServerSpan(span pdata.Span) {
 	span.SetParentSpanID(newSegmentID())
 	span.SetName("/users/junit")
 	span.SetKind(pdata.SpanKindSERVER)
-	span.SetStartTime(pdata.TimestampFromTime(startTime))
-	span.SetEndTime(pdata.TimestampFromTime(endTime))
+	span.SetStartTimestamp(pdata.TimestampFromTime(startTime))
+	span.SetEndTimestamp(pdata.TimestampFromTime(endTime))
 
 	status := span.Status()
 	status.SetCode(2)

diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod
@@ -17,7 +17,7 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws v0.0.0-00010101000000-000000000000
 	github.com/pelletier/go-toml v1.8.0 // indirect
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/collector v0.23.1-0.20210331155714-fe86ab5cba6d
+	go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15
 	go.uber.org/zap v1.16.0
 	google.golang.org/protobuf v1.26.0
 	gopkg.in/ini.v1 v1.57.0 // indirect

diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum
@@ -1047,8 +1047,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.23.1-0.20210331155714-fe86ab5cba6d h1:dKUPQciOVKguQyhUUZ8h0Jw1LtrNOeDUh5DY05rX398=
-go.opentelemetry.io/collector v0.23.1-0.20210331155714-fe86ab5cba6d/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM=
+go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM=
+go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM=
 go.opentelemetry.io/otel v0.19.0 h1:Lenfy7QHRXPZVsw/12CWpxX6d/JkrX8wrx2vO8G80Ng=
 go.opentelemetry.io/otel v0.19.0/go.mod h1:j9bF567N9EfomkSidSfmMwIwIBuP37AMAIzVW85OxSg=
 go.opentelemetry.io/otel/metric v0.19.0/go.mod h1:8f9fglJPRnXuskQmKpnad31lcLJ2VmNNqIsx/uIwBSc=

diff --git a/exporter/awskinesisexporter/go.mod b/exporter/awskinesisexporter/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/pelletier/go-toml v1.8.0 // indirect
 	github.com/signalfx/opencensus-go-exporter-kinesis v0.6.3
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/collector v0.23.1-0.20210331155714-fe86ab5cba6d
+	go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15
 	go.uber.org/zap v1.16.0
 	gopkg.in/ini.v1 v1.57.0 // indirect
 )
diff --git a/exporter/awskinesisexporter/go.sum b/exporter/awskinesisexporter/go.sum
@@ -1077,8 +1077,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.23.1-0.20210331155714-fe86ab5cba6d h1:dKUPQciOVKguQyhUUZ8h0Jw1LtrNOeDUh5DY05rX398=
-go.opentelemetry.io/collector v0.23.1-0.20210331155714-fe86ab5cba6d/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM=
+go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM=
+go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/awsprometheusremotewriteexporter/go.mod b/exporter/awsprometheusremotewriteexporter/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/onsi/gomega v1.10.2 // indirect
 	github.com/pelletier/go-toml v1.8.0 // indirect
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/collector v0.23.1-0.20210331155714-fe86ab5cba6d
+	go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15
 	go.uber.org/zap v1.16.0
 	gopkg.in/ini.v1 v1.57.0 // indirect
 )
diff --git a/exporter/awsprometheusremotewriteexporter/go.sum b/exporter/awsprometheusremotewriteexporter/go.sum
@@ -1047,8 +1047,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.23.1-0.20210331155714-fe86ab5cba6d h1:dKUPQciOVKguQyhUUZ8h0Jw1LtrNOeDUh5DY05rX398=
-go.opentelemetry.io/collector v0.23.1-0.20210331155714-fe86ab5cba6d/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM=
+go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM=
+go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/awsxrayexporter/awsxray_test.go b/exporter/awsxrayexporter/awsxray_test.go
@@ -113,8 +113,8 @@ func constructHTTPClientSpan() pdata.Span {
 	span.SetParentSpanID(newSegmentID())
 	span.SetName("/users/junit")
 	span.SetKind(pdata.SpanKindCLIENT)
-	span.SetStartTime(pdata.TimestampFromTime(startTime))
-	span.SetEndTime(pdata.TimestampFromTime(endTime))
+	span.SetStartTimestamp(pdata.TimestampFromTime(startTime))
+	span.SetEndTimestamp(pdata.TimestampFromTime(endTime))
 
 	status := pdata.NewSpanStatus()
 	status.SetCode(0)
@@ -141,8 +141,8 @@ func constructHTTPServerSpan() pdata.Span {
 	span.SetParentSpanID(newSegmentID())
 	span.SetName("/users/junit")
 	span.SetKind(pdata.SpanKindSERVER)
-	span.SetStartTime(pdata.TimestampFromTime(startTime))
-	span.SetEndTime(pdata.TimestampFromTime(endTime))
+	span.SetStartTimestamp(pdata.TimestampFromTime(startTime))
+	span.SetEndTimestamp(pdata.TimestampFromTime(endTime))
 
 	status := pdata.NewSpanStatus()
 	status.SetCode(0)

diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray v0.0.0-00010101000000-000000000000
 	github.com/pelletier/go-toml v1.8.0 // indirect
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/collector v0.23.1-0.20210331155714-fe86ab5cba6d
+	go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15
 	go.uber.org/zap v1.16.0
 	golang.org/x/net v0.0.0-20210119194325-5f4716e94777
 	gopkg.in/ini.v1 v1.57.0 // indirect

diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum
@@ -1047,8 +1047,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.23.1-0.20210331155714-fe86ab5cba6d h1:dKUPQciOVKguQyhUUZ8h0Jw1LtrNOeDUh5DY05rX398=
-go.opentelemetry.io/collector v0.23.1-0.20210331155714-fe86ab5cba6d/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM=
+go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM=
+go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/awsxrayexporter/translator/cause_test.go b/exporter/awsxrayexporter/translator/cause_test.go
@@ -178,8 +178,8 @@ func constructExceptionServerSpan(attributes map[string]interface{}, statuscode
 	span.SetParentSpanID(newSegmentID())
 	span.SetName("/widgets")
 	span.SetKind(pdata.SpanKindSERVER)
-	span.SetStartTime(pdata.TimestampFromTime(startTime))
-	span.SetEndTime(pdata.TimestampFromTime(endTime))
+	span.SetStartTimestamp(pdata.TimestampFromTime(startTime))
+	span.SetEndTimestamp(pdata.TimestampFromTime(endTime))
 
 	status := pdata.NewSpanStatus()
 	status.SetCode(statuscode)

diff --git a/exporter/awsxrayexporter/translator/http_test.go b/exporter/awsxrayexporter/translator/http_test.go
@@ -229,7 +229,7 @@ func TestServerSpanWithSchemeNamePortTargetAttributes(t *testing.T) {
 	attributes[semconventions.AttributeHTTPClientIP] = "192.168.15.32"
 	attributes[semconventions.AttributeHTTPStatusCode] = 200
 	span := constructHTTPServerSpan(attributes)
-	timeEvents := constructTimedEventsWithReceivedMessageEvent(span.EndTime())
+	timeEvents := constructTimedEventsWithReceivedMessageEvent(span.EndTimestamp())
 	timeEvents.CopyTo(span.Events())
 
 	filtered, httpData := makeHTTP(span)
@@ -275,7 +275,7 @@ func TestSpanWithNotEnoughHTTPRequestURLAttributes(t *testing.T) {
 	attributes[semconventions.AttributeNetPeerPort] = 8080
 	attributes[semconventions.AttributeHTTPStatusCode] = 200
 	span := constructHTTPServerSpan(attributes)
-	timeEvents := constructTimedEventsWithReceivedMessageEvent(span.EndTime())
+	timeEvents := constructTimedEventsWithReceivedMessageEvent(span.EndTimestamp())
 	timeEvents.CopyTo(span.Events())
 
 	filtered, httpData := makeHTTP(span)
@@ -301,8 +301,8 @@ func constructHTTPClientSpan(attributes map[string]interface{}) pdata.Span {
 	span.SetParentSpanID(newSegmentID())
 	span.SetName("/users/junit")
 	span.SetKind(pdata.SpanKindCLIENT)
-	span.SetStartTime(pdata.TimestampFromTime(startTime))
-	span.SetEndTime(pdata.TimestampFromTime(endTime))
+	span.SetStartTimestamp(pdata.TimestampFromTime(startTime))
+	span.SetEndTimestamp(pdata.TimestampFromTime(endTime))
 
 	status := pdata.NewSpanStatus()
 	status.SetCode(0)
@@ -324,8 +324,8 @@ func constructHTTPServerSpan(attributes map[string]interface{}) pdata.Span {
 	span.SetParentSpanID(newSegmentID())
 	span.SetName("/users/junit")
 	span.SetKind(pdata.SpanKindSERVER)
-	span.SetStartTime(pdata.TimestampFromTime(startTime))
-	span.SetEndTime(pdata.TimestampFromTime(endTime))
+	span.SetStartTimestamp(pdata.TimestampFromTime(startTime))
+	span.SetEndTimestamp(pdata.TimestampFromTime(endTime))
 
 	status := pdata.NewSpanStatus()
 	status.SetCode(0)

diff --git a/exporter/awsxrayexporter/translator/segment.go b/exporter/awsxrayexporter/translator/segment.go
@@ -97,8 +97,8 @@ func MakeSegment(span pdata.Span, resource pdata.Resource, indexedAttrs []string
 	}
 
 	var (
-		startTime                              = timestampToFloatSeconds(span.StartTime())
-		endTime                                = timestampToFloatSeconds(span.EndTime())
+		startTime                              = timestampToFloatSeconds(span.StartTimestamp())
+		endTime                                = timestampToFloatSeconds(span.EndTimestamp())
 		httpfiltered, http                     = makeHTTP(span)
 		isError, isFault, causefiltered, cause = makeCause(span, httpfiltered, resource)
 		origin                                 = determineAwsOrigin(resource)

diff --git a/exporter/awsxrayexporter/translator/segment_test.go b/exporter/awsxrayexporter/translator/segment_test.go
@@ -108,7 +108,7 @@ func TestServerSpanWithInternalServerError(t *testing.T) {
 	attributes[semconventions.AttributeEnduserID] = enduser
 	resource := constructDefaultResource()
 	span := constructServerSpan(parentSpanID, spanName, pdata.StatusCodeError, errorMessage, attributes)
-	timeEvents := constructTimedEventsWithSentMessageEvent(span.StartTime())
+	timeEvents := constructTimedEventsWithSentMessageEvent(span.StartTimestamp())
 	timeEvents.CopyTo(span.Events())
 
 	segment, _ := MakeSegment(span, resource, nil, false)
@@ -137,8 +137,8 @@ func TestSpanNoParentId(t *testing.T) {
 	span.SetSpanID(newSegmentID())
 	span.SetParentSpanID(pdata.InvalidSpanID())
 	span.SetKind(pdata.SpanKindPRODUCER)
-	span.SetStartTime(pdata.TimestampFromTime(time.Now()))
-	span.SetEndTime(pdata.TimestampFromTime(time.Now().Add(10)))
+	span.SetStartTimestamp(pdata.TimestampFromTime(time.Now()))
+	span.SetEndTimestamp(pdata.TimestampFromTime(time.Now().Add(10)))
 	resource := pdata.NewResource()
 	segment, _ := MakeSegment(span, resource, nil, false)
 
@@ -152,8 +152,8 @@ func TestSpanWithNoStatus(t *testing.T) {
 	span.SetSpanID(newSegmentID())
 	span.SetParentSpanID(newSegmentID())
 	span.SetKind(pdata.SpanKindSERVER)
-	span.SetStartTime(pdata.TimestampFromTime(time.Now()))
-	span.SetEndTime(pdata.TimestampFromTime(time.Now().Add(10)))
+	span.SetStartTimestamp(pdata.TimestampFromTime(time.Now()))
+	span.SetEndTimestamp(pdata.TimestampFromTime(time.Now().Add(10)))
 
 	resource := pdata.NewResource()
 	segment, _ := MakeSegment(span, resource, nil, false)
@@ -272,7 +272,7 @@ func TestSpanWithInvalidTraceId(t *testing.T) {
 	attributes[semconventions.AttributeHTTPTarget] = spanName
 	resource := constructDefaultResource()
 	span := constructClientSpan(pdata.InvalidSpanID(), spanName, pdata.StatusCodeUnset, "OK", attributes)
-	timeEvents := constructTimedEventsWithSentMessageEvent(span.StartTime())
+	timeEvents := constructTimedEventsWithSentMessageEvent(span.StartTimestamp())
 	timeEvents.CopyTo(span.Events())
 	traceID := span.TraceID().Bytes()
 	traceID[0] = 0x11
@@ -322,7 +322,7 @@ func TestServerSpanWithNilAttributes(t *testing.T) {
 	attributes := make(map[string]interface{})
 	resource := constructDefaultResource()
 	span := constructServerSpan(parentSpanID, spanName, pdata.StatusCodeError, "OK", attributes)
-	timeEvents := constructTimedEventsWithSentMessageEvent(span.StartTime())
+	timeEvents := constructTimedEventsWithSentMessageEvent(span.StartTimestamp())
 	timeEvents.CopyTo(span.Events())
 	pdata.NewAttributeMap().CopyTo(span.Attributes())
 
@@ -635,8 +635,8 @@ func constructClientSpan(parentSpanID pdata.SpanID, name string, code pdata.Stat
 	span.SetParentSpanID(parentSpanID)
 	span.SetName(name)
 	span.SetKind(pdata.SpanKindCLIENT)
-	span.SetStartTime(pdata.TimestampFromTime(startTime))
-	span.SetEndTime(pdata.TimestampFromTime(endTime))
+	span.SetStartTimestamp(pdata.TimestampFromTime(startTime))
+	span.SetEndTimestamp(pdata.TimestampFromTime(endTime))
 
 	status := pdata.NewSpanStatus()
 	status.SetCode(code)
@@ -662,8 +662,8 @@ func constructServerSpan(parentSpanID pdata.SpanID, name string, code pdata.Stat
 	span.SetParentSpanID(parentSpanID)
 	span.SetName(name)
 	span.SetKind(pdata.SpanKindSERVER)
-	span.SetStartTime(pdata.TimestampFromTime(startTime))
-	span.SetEndTime(pdata.TimestampFromTime(endTime))
+	span.SetStartTimestamp(pdata.TimestampFromTime(startTime))
+	span.SetEndTimestamp(pdata.TimestampFromTime(endTime))
 
 	status := pdata.NewSpanStatus()
 	status.SetCode(code)

diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/pelletier/go-toml v1.8.0 // indirect
 	github.com/stretchr/testify v1.7.0
 	github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 // indirect
-	go.opentelemetry.io/collector v0.23.1-0.20210331155714-fe86ab5cba6d
+	go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15
 	go.uber.org/zap v1.16.0
 	golang.org/x/net v0.0.0-20210119194325-5f4716e94777
 	gopkg.in/ini.v1 v1.57.0 // indirect

diff --git a/exporter/azuremonitorexporter/go.sum b/exporter/azuremonitorexporter/go.sum
@@ -1057,8 +1057,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.23.1-0.20210331155714-fe86ab5cba6d h1:dKUPQciOVKguQyhUUZ8h0Jw1LtrNOeDUh5DY05rX398=
-go.opentelemetry.io/collector v0.23.1-0.20210331155714-fe86ab5cba6d/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM=
+go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM=
+go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/azuremonitorexporter/trace_to_envelope.go b/exporter/azuremonitorexporter/trace_to_envelope.go
@@ -74,7 +74,7 @@ func spanToEnvelope(
 
 	envelope := contracts.NewEnvelope()
 	envelope.Tags = make(map[string]string)
-	envelope.Time = toTime(span.StartTime()).Format(time.RFC3339Nano)
+	envelope.Time = toTime(span.StartTimestamp()).Format(time.RFC3339Nano)
 	envelope.Tags[contracts.OperationId] = span.TraceID().HexString()
 	envelope.Tags[contracts.OperationParentId] = span.ParentSpanID().HexString()
 
@@ -577,8 +577,8 @@ func copyAndExtractMessagingAttributes(
 }
 
 func formatSpanDuration(span pdata.Span) string {
-	startTime := toTime(span.StartTime())
-	endTime := toTime(span.EndTime())
+	startTime := toTime(span.StartTimestamp())
+	endTime := toTime(span.EndTimestamp())
 	return formatDuration(endTime.Sub(startTime))
 }