Update core version to v0.22.0

SumoLogic · Mar 18, 2021 · 36c6b38 · 36c6b38
1 parent 83473c8
commit 36c6b38
Show file tree

Hide file tree

Showing 12 changed files with 367 additions and 14 deletions.
diff --git a/go.mod b/go.mod
@@ -65,7 +65,7 @@ require (
 	golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43
 )
 
-replace go.opentelemetry.io/collector => github.com/SumoLogic/opentelemetry-collector v0.21.0-sumo
+replace go.opentelemetry.io/collector => github.com/SumoLogic/opentelemetry-collector v0.22.0-sumo
 
 replace github.com/influxdata/telegraf => github.com/sumologic/telegraf v1.17.3-sumo
 

diff --git a/go.sum b/go.sum
diff --git a/processor/cascadingfilterprocessor/cascading_test.go b/processor/cascadingfilterprocessor/cascading_test.go
@@ -56,8 +56,8 @@ func fillSpan(span *pdata.Span, durationMicros int64) {
 	startTime := nowTs - durationMicros*1000
 
 	span.Attributes().InsertInt("foo", 55)
-	span.SetStartTime(pdata.TimestampUnixNano(startTime))
-	span.SetEndTime(pdata.TimestampUnixNano(nowTs))
+	span.SetStartTime(pdata.Timestamp(startTime))
+	span.SetEndTime(pdata.Timestamp(nowTs))
 }
 
 func createTrace(fsp *cascadingFilterSpanProcessor, numSpans int, durationMicros int64) *sampling.TraceData {

diff --git a/processor/cascadingfilterprocessor/go.mod b/processor/cascadingfilterprocessor/go.mod
@@ -5,9 +5,9 @@ go 1.14
 require (
 	github.com/google/uuid v1.2.0
 	github.com/stretchr/testify v1.7.0
-	go.opencensus.io v0.22.6
+	go.opencensus.io v0.23.0
 	go.opentelemetry.io/collector v0.19.0
 	go.uber.org/zap v1.16.0
 )
 
-replace go.opentelemetry.io/collector => github.com/SumoLogic/opentelemetry-collector v0.21.0-sumo
+replace go.opentelemetry.io/collector => github.com/SumoLogic/opentelemetry-collector v0.22.0-sumo
diff --git a/processor/cascadingfilterprocessor/go.sum b/processor/cascadingfilterprocessor/go.sum
diff --git a/processor/cascadingfilterprocessor/sampling/policy_filter.go b/processor/cascadingfilterprocessor/sampling/policy_filter.go
@@ -28,7 +28,7 @@ func (pe *policyEvaluator) OnLateArrivingSpans(earlyDecision Decision, spans []*
 	return nil
 }
 
-func tsToMicros(ts pdata.TimestampUnixNano) int64 {
+func tsToMicros(ts pdata.Timestamp) int64 {
 	return int64(ts / 1000)
 }
 

diff --git a/processor/cascadingfilterprocessor/sampling/span_properties_filter_test.go b/processor/cascadingfilterprocessor/sampling/span_properties_filter_test.go
@@ -153,8 +153,8 @@ func newTraceAttrs(operationName string, duration time.Duration, numberOfSpans i
 	for i := 0; i < numberOfSpans; i++ {
 		span := ils.Spans().At(i)
 		span.SetName(operationName)
-		span.SetStartTime(pdata.TimestampUnixNano(startTs))
-		span.SetEndTime(pdata.TimestampUnixNano(endTs))
+		span.SetStartTime(pdata.Timestamp(startTs))
+		span.SetEndTime(pdata.Timestamp(endTs))
 	}
 
 	traceBatches = append(traceBatches, traces)

diff --git a/processor/k8sprocessor/go.sum b/processor/k8sprocessor/go.sum
@@ -98,6 +98,8 @@ github.com/SumoLogic/opentelemetry-collector v0.12.0 h1:eplzxiBs4uBkfO7jWMRERqxr
 github.com/SumoLogic/opentelemetry-collector v0.12.0/go.mod h1:mKQha2MeRhJi0rHS8yvZlzFk28ZVBCf6qMTsjGX0n1Y=
 github.com/SumoLogic/opentelemetry-collector v0.13.0 h1:uBEKNAJwVqEKcTq6BXZMMOfwZHN/4Qbe0Fqb/MrD4Eg=
 github.com/SumoLogic/opentelemetry-collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
+github.com/SumoLogic/opentelemetry-collector v0.22.0-sumo h1:Vcs1lbNIKhjvtMekLUUlWep6N7qKOM4eEj02tMuziu0=
+github.com/SumoLogic/opentelemetry-collector v0.22.0-sumo/go.mod h1:sBkAGYUQSh1f+owCK0aPV2uLcUB6rPHEOWjdvuE2SdQ=
 github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE=
 github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
 github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=

diff --git a/processor/k8sprocessor/kube/client_test.go b/processor/k8sprocessor/kube/client_test.go
@@ -363,7 +363,7 @@ func TestNoHostnameExtractionRules(t *testing.T) {
 	}
 
 	c.handlePodAdd(pod)
-	p, _ := c.GetPodByIP(pod.Status.PodIP)
+	p, _ := c.GetPod(PodIdentifier(pod.Status.PodIP))
 	assert.Equal(t, p.Attributes["k8s.pod.hostname"], podName)
 }
 

diff --git a/processor/tailsamplingprocessor/sampling/cascading_test.go b/processor/tailsamplingprocessor/sampling/cascading_test.go
@@ -31,8 +31,8 @@ func fillSpan(span *pdata.Span, durationMicros int64) {
 	startTime := nowTs - durationMicros*1000
 
 	span.Attributes().InsertInt("foo", 55)
-	span.SetStartTime(pdata.TimestampUnixNano(startTime))
-	span.SetEndTime(pdata.TimestampUnixNano(nowTs))
+	span.SetStartTime(pdata.Timestamp(startTime))
+	span.SetEndTime(pdata.Timestamp(nowTs))
 }
 
 func createTrace(numSpans int, durationMicros int64) *TraceData {

diff --git a/processor/tailsamplingprocessor/sampling/span_properties_filter.go b/processor/tailsamplingprocessor/sampling/span_properties_filter.go
@@ -77,7 +77,7 @@ func (df *spanPropertiesFilter) EvaluateSecondChance(_ pdata.TraceID, trace *Tra
 	return NotSampled, nil
 }
 
-func tsToMicros(ts pdata.TimestampUnixNano) int64 {
+func tsToMicros(ts pdata.Timestamp) int64 {
 	return int64(ts / 1000)
 }
 

diff --git a/processor/tailsamplingprocessor/sampling/span_properties_filter_test.go b/processor/tailsamplingprocessor/sampling/span_properties_filter_test.go
@@ -131,8 +131,8 @@ func newTraceAttrs(operationName string, durationMicros int64, numberOfSpans int
 	for i := 0; i < numberOfSpans; i++ {
 		span := ils.Spans().At(i)
 		span.SetName(operationName)
-		span.SetStartTime(pdata.TimestampUnixNano(startTs))
-		span.SetEndTime(pdata.TimestampUnixNano(endTs))
+		span.SetStartTime(pdata.Timestamp(startTs))
+		span.SetEndTime(pdata.Timestamp(endTs))
 	}
 
 	traceBatches = append(traceBatches, traces)