Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update core to latest version and fix TraceID usage in components #1120

Merged
merged 1 commit into from
Sep 24, 2020
Merged

Update core to latest version and fix TraceID usage in components #1120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion exporter/alibabacloudlogserviceexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/census-instrumentation/opencensus-proto v0.3.0
github.com/gogo/protobuf v1.3.1
github.com/stretchr/testify v1.6.1
go.opentelemetry.io/collector v0.11.0
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da
go.uber.org/zap v1.16.0
google.golang.org/protobuf v1.25.0
)
4 changes: 2 additions & 2 deletions exporter/alibabacloudlogserviceexporter/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,8 +1014,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opentelemetry.io/collector v0.11.0 h1:8BdUHERjEN6HMQoMRu1cVK89L/4uPNYFkn4Bht5yKMo=
go.opentelemetry.io/collector v0.11.0/go.mod h1:tJNTr3RWiwUyYKI6dtlHY+G/jfKa/+Ewv6MvmwLiqoE=
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da h1:W990SgXqeewmIaj1I53yr253Kdl7+7yu6wPB/jUlxIo=
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da/go.mod h1:tJNTr3RWiwUyYKI6dtlHY+G/jfKa/+Ewv6MvmwLiqoE=
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=
Expand Down
4 changes: 2 additions & 2 deletions exporter/awsxrayexporter/awsxray_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,15 +174,15 @@ func constructSpanAttributes(attributes map[string]interface{}) pdata.AttributeM
return attrs
}

func newTraceID() []byte {
func newTraceID() pdata.TraceID {
var r [16]byte
epoch := time.Now().Unix()
binary.BigEndian.PutUint32(r[0:4], uint32(epoch))
_, err := rand.Read(r[4:])
if err != nil {
panic(err)
}
return r[:]
return pdata.NewTraceID(r[:])
}

func newSegmentID() []byte {
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsxrayexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/aws/aws-sdk-go v1.34.30
github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray v0.0.0-00010101000000-000000000000
github.com/stretchr/testify v1.6.1
go.opentelemetry.io/collector v0.11.0
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da
go.uber.org/zap v1.16.0
golang.org/x/net v0.0.0-20200822124328-c89045814202
google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/awsxrayexporter/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1104,8 +1104,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opentelemetry.io/collector v0.11.0 h1:8BdUHERjEN6HMQoMRu1cVK89L/4uPNYFkn4Bht5yKMo=
go.opentelemetry.io/collector v0.11.0/go.mod h1:tJNTr3RWiwUyYKI6dtlHY+G/jfKa/+Ewv6MvmwLiqoE=
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da h1:W990SgXqeewmIaj1I53yr253Kdl7+7yu6wPB/jUlxIo=
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da/go.mod h1:tJNTr3RWiwUyYKI6dtlHY+G/jfKa/+Ewv6MvmwLiqoE=
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=
Expand Down
6 changes: 3 additions & 3 deletions exporter/awsxrayexporter/translator/segment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ func newTraceID() pdata.TraceID {
if err != nil {
panic(err)
}
return r[:]
return pdata.NewTraceID(r[:])
}

// newSegmentID generates a new valid X-Ray SegmentID
Expand Down Expand Up @@ -251,7 +251,7 @@ func convertToAmazonTraceID(traceID pdata.TraceID) string {
var (
content = [traceIDLength]byte{}
epochNow = time.Now().Unix()
epoch = int64(binary.BigEndian.Uint32(traceID[0:4]))
epoch = int64(binary.BigEndian.Uint32(traceID.Bytes()[0:4]))
b = [4]byte{}
)

Expand All @@ -271,7 +271,7 @@ func convertToAmazonTraceID(traceID pdata.TraceID) string {
content[1] = '-'
hex.Encode(content[2:10], b[0:4])
content[10] = '-'
hex.Encode(content[identifierOffset:], traceID[4:16]) // overwrite with identifier
hex.Encode(content[identifierOffset:], traceID.Bytes()[4:16]) // overwrite with identifier

return string(content[0:traceIDLength])
}
Expand Down
6 changes: 3 additions & 3 deletions exporter/awsxrayexporter/translator/segment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,9 @@ func TestSpanWithInvalidTraceId(t *testing.T) {
span := constructClientSpan(nil, spanName, 0, "OK", attributes)
timeEvents := constructTimedEventsWithSentMessageEvent(span.StartTime())
timeEvents.CopyTo(span.Events())
traceID := []byte(span.TraceID())
traceID := span.TraceID().Bytes()
traceID[0] = 0x11
span.SetTraceID(traceID)
span.SetTraceID(pdata.NewTraceID(traceID))

jsonStr, err := MakeSegmentDocumentString(span, resource, nil, false)

Expand All @@ -285,7 +285,7 @@ func TestSpanWithExpiredTraceId(t *testing.T) {
ExpiredEpoch := time.Now().Unix() - maxAge - 1

TempTraceID := newTraceID()
binary.BigEndian.PutUint32(TempTraceID[0:4], uint32(ExpiredEpoch))
binary.BigEndian.PutUint32(TempTraceID.Bytes()[0:4], uint32(ExpiredEpoch))

PrevEpoch := uint32(time.Now().Unix())

Expand Down
2 changes: 1 addition & 1 deletion exporter/azuremonitorexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/microsoft/ApplicationInsights-Go v0.4.3
github.com/stretchr/testify v1.6.1
github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 // indirect
go.opentelemetry.io/collector v0.11.0
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da
go.uber.org/zap v1.16.0
golang.org/x/net v0.0.0-20200822124328-c89045814202
google.golang.org/grpc v1.32.0
Expand Down
4 changes: 2 additions & 2 deletions exporter/azuremonitorexporter/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1110,8 +1110,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opentelemetry.io/collector v0.11.0 h1:8BdUHERjEN6HMQoMRu1cVK89L/4uPNYFkn4Bht5yKMo=
go.opentelemetry.io/collector v0.11.0/go.mod h1:tJNTr3RWiwUyYKI6dtlHY+G/jfKa/+Ewv6MvmwLiqoE=
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da h1:W990SgXqeewmIaj1I53yr253Kdl7+7yu6wPB/jUlxIo=
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da/go.mod h1:tJNTr3RWiwUyYKI6dtlHY+G/jfKa/+Ewv6MvmwLiqoE=
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=
Expand Down
2 changes: 1 addition & 1 deletion exporter/azuremonitorexporter/trace_to_envelope.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func spanToEnvelope(
envelope := contracts.NewEnvelope()
envelope.Tags = make(map[string]string)
envelope.Time = toTime(span.StartTime()).Format(time.RFC3339Nano)
traceIDHexString := idToHex(span.TraceID())
traceIDHexString := idToHex(span.TraceID().Bytes())
envelope.Tags[contracts.OperationId] = traceIDHexString
envelope.Tags[contracts.OperationParentId] = idToHex(span.ParentSpanID())

Expand Down
2 changes: 1 addition & 1 deletion exporter/azuremonitorexporter/trace_to_envelope_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,7 +748,7 @@ func assertAttributesCopiedToPropertiesOrMeasurements(
func getSpan(spanName string, spanKind pdata.SpanKind, initialAttributes map[string]pdata.AttributeValue) pdata.Span {
span := pdata.NewSpan()
span.InitEmpty()
span.SetTraceID(defaultTraceID)
span.SetTraceID(pdata.NewTraceID(defaultTraceID))
span.SetSpanID(defaultSpanID)
span.SetParentSpanID(defaultParentSpanID)
span.SetName(spanName)
Expand Down
2 changes: 1 addition & 1 deletion exporter/carbonexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.14
require (
github.com/census-instrumentation/opencensus-proto v0.3.0
github.com/stretchr/testify v1.6.1
go.opentelemetry.io/collector v0.11.0
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da
go.uber.org/zap v1.16.0
google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect
)
4 changes: 2 additions & 2 deletions exporter/carbonexporter/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1100,8 +1100,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opentelemetry.io/collector v0.11.0 h1:8BdUHERjEN6HMQoMRu1cVK89L/4uPNYFkn4Bht5yKMo=
go.opentelemetry.io/collector v0.11.0/go.mod h1:tJNTr3RWiwUyYKI6dtlHY+G/jfKa/+Ewv6MvmwLiqoE=
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da h1:W990SgXqeewmIaj1I53yr253Kdl7+7yu6wPB/jUlxIo=
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da/go.mod h1:tJNTr3RWiwUyYKI6dtlHY+G/jfKa/+Ewv6MvmwLiqoE=
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=
Expand Down
2 changes: 1 addition & 1 deletion exporter/elasticexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/stretchr/testify v1.6.1
go.elastic.co/apm v1.8.1-0.20200515083825-95e54b2e24ea
go.elastic.co/fastjson v1.1.0
go.opentelemetry.io/collector v0.11.0
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da
go.uber.org/zap v1.16.0
google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect
)
4 changes: 2 additions & 2 deletions exporter/elasticexporter/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1117,8 +1117,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opentelemetry.io/collector v0.11.0 h1:8BdUHERjEN6HMQoMRu1cVK89L/4uPNYFkn4Bht5yKMo=
go.opentelemetry.io/collector v0.11.0/go.mod h1:tJNTr3RWiwUyYKI6dtlHY+G/jfKa/+Ewv6MvmwLiqoE=
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da h1:W990SgXqeewmIaj1I53yr253Kdl7+7yu6wPB/jUlxIo=
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da/go.mod h1:tJNTr3RWiwUyYKI6dtlHY+G/jfKa/+Ewv6MvmwLiqoE=
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=
Expand Down
2 changes: 1 addition & 1 deletion exporter/elasticexporter/internal/translator/elastic/traces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func EncodeSpan(otlpSpan pdata.Span, otlpLibrary pdata.InstrumentationLibrary, w
var spanID, parentID model.SpanID
var traceID model.TraceID
copy(spanID[:], otlpSpan.SpanID())
copy(traceID[:], otlpSpan.TraceID())
copy(traceID[:], otlpSpan.TraceID().Bytes())
copy(parentID[:], otlpSpan.ParentSpanID())
root := parentID == model.SpanID{}

Expand Down
2 changes: 1 addition & 1 deletion exporter/elasticexporter/internal/translator/elastic/traces_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func TestEncodeResourceSpan(t *testing.T) {
serverSpan.Status().SetCode(-1)

for _, span := range []pdata.Span{rootSpan, clientSpan, serverSpan} {
span.SetTraceID(pdata.TraceID(traceID[:]))
span.SetTraceID(pdata.NewTraceID(traceID[:]))
span.SetStartTime(pdata.TimestampUnixNano(startTime.UnixNano()))
span.SetEndTime(pdata.TimestampUnixNano(endTime.UnixNano()))
}
Expand Down
2 changes: 1 addition & 1 deletion exporter/honeycombexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/honeycombio/libhoney-go v1.14.0
github.com/klauspost/compress v1.11.0
github.com/stretchr/testify v1.6.1
go.opentelemetry.io/collector v0.11.0
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da
go.uber.org/zap v1.16.0
google.golang.org/grpc v1.32.0
google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/honeycombexporter/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1122,8 +1122,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opentelemetry.io/collector v0.11.0 h1:8BdUHERjEN6HMQoMRu1cVK89L/4uPNYFkn4Bht5yKMo=
go.opentelemetry.io/collector v0.11.0/go.mod h1:tJNTr3RWiwUyYKI6dtlHY+G/jfKa/+Ewv6MvmwLiqoE=
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da h1:W990SgXqeewmIaj1I53yr253Kdl7+7yu6wPB/jUlxIo=
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da/go.mod h1:tJNTr3RWiwUyYKI6dtlHY+G/jfKa/+Ewv6MvmwLiqoE=
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=
Expand Down
2 changes: 1 addition & 1 deletion exporter/jaegerthrifthttpexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/google/go-cmp v0.5.2
github.com/jaegertracing/jaeger v1.19.2
github.com/stretchr/testify v1.6.1
go.opentelemetry.io/collector v0.11.0
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da
go.uber.org/zap v1.16.0
google.golang.org/protobuf v1.25.0
)
4 changes: 2 additions & 2 deletions exporter/jaegerthrifthttpexporter/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1100,8 +1100,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opentelemetry.io/collector v0.11.0 h1:8BdUHERjEN6HMQoMRu1cVK89L/4uPNYFkn4Bht5yKMo=
go.opentelemetry.io/collector v0.11.0/go.mod h1:tJNTr3RWiwUyYKI6dtlHY+G/jfKa/+Ewv6MvmwLiqoE=
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da h1:W990SgXqeewmIaj1I53yr253Kdl7+7yu6wPB/jUlxIo=
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da/go.mod h1:tJNTr3RWiwUyYKI6dtlHY+G/jfKa/+Ewv6MvmwLiqoE=
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=
Expand Down
2 changes: 1 addition & 1 deletion exporter/kinesisexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.14
require (
github.com/signalfx/opencensus-go-exporter-kinesis v0.6.3
github.com/stretchr/testify v1.6.1
go.opentelemetry.io/collector v0.11.0
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da
go.uber.org/zap v1.16.0
google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect
)
4 changes: 2 additions & 2 deletions exporter/kinesisexporter/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1131,8 +1131,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opentelemetry.io/collector v0.11.0 h1:8BdUHERjEN6HMQoMRu1cVK89L/4uPNYFkn4Bht5yKMo=
go.opentelemetry.io/collector v0.11.0/go.mod h1:tJNTr3RWiwUyYKI6dtlHY+G/jfKa/+Ewv6MvmwLiqoE=
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da h1:W990SgXqeewmIaj1I53yr253Kdl7+7yu6wPB/jUlxIo=
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da/go.mod h1:tJNTr3RWiwUyYKI6dtlHY+G/jfKa/+Ewv6MvmwLiqoE=
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=
Expand Down
2 changes: 1 addition & 1 deletion exporter/newrelicexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/newrelic/newrelic-telemetry-sdk-go v0.4.0
github.com/stretchr/testify v1.6.1
go.opencensus.io v0.22.4
go.opentelemetry.io/collector v0.11.0
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da
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
Expand Down
4 changes: 2 additions & 2 deletions exporter/newrelicexporter/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1102,8 +1102,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opentelemetry.io/collector v0.11.0 h1:8BdUHERjEN6HMQoMRu1cVK89L/4uPNYFkn4Bht5yKMo=
go.opentelemetry.io/collector v0.11.0/go.mod h1:tJNTr3RWiwUyYKI6dtlHY+G/jfKa/+Ewv6MvmwLiqoE=
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da h1:W990SgXqeewmIaj1I53yr253Kdl7+7yu6wPB/jUlxIo=
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da/go.mod h1:tJNTr3RWiwUyYKI6dtlHY+G/jfKa/+Ewv6MvmwLiqoE=
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=
Expand Down
2 changes: 1 addition & 1 deletion exporter/sapmexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.0.0-00010101000000-000000000000
github.com/signalfx/sapm-proto v0.5.3
github.com/stretchr/testify v1.6.1
go.opentelemetry.io/collector v0.11.0
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da
go.uber.org/zap v1.16.0
)

Expand Down
4 changes: 2 additions & 2 deletions exporter/sapmexporter/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1110,8 +1110,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opentelemetry.io/collector v0.11.0 h1:8BdUHERjEN6HMQoMRu1cVK89L/4uPNYFkn4Bht5yKMo=
go.opentelemetry.io/collector v0.11.0/go.mod h1:tJNTr3RWiwUyYKI6dtlHY+G/jfKa/+Ewv6MvmwLiqoE=
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da h1:W990SgXqeewmIaj1I53yr253Kdl7+7yu6wPB/jUlxIo=
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da/go.mod h1:tJNTr3RWiwUyYKI6dtlHY+G/jfKa/+Ewv6MvmwLiqoE=
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=
Expand Down
2 changes: 1 addition & 1 deletion exporter/sentryexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/getsentry/sentry-go v0.6.2-0.20200707113342-e7c66ce62664
github.com/google/go-cmp v0.5.2
github.com/stretchr/testify v1.6.1
go.opentelemetry.io/collector v0.11.0
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da
go.uber.org/zap v1.16.0
google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect
)
4 changes: 2 additions & 2 deletions exporter/sentryexporter/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1175,8 +1175,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opentelemetry.io/collector v0.11.0 h1:8BdUHERjEN6HMQoMRu1cVK89L/4uPNYFkn4Bht5yKMo=
go.opentelemetry.io/collector v0.11.0/go.mod h1:tJNTr3RWiwUyYKI6dtlHY+G/jfKa/+Ewv6MvmwLiqoE=
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da h1:W990SgXqeewmIaj1I53yr253Kdl7+7yu6wPB/jUlxIo=
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da/go.mod h1:tJNTr3RWiwUyYKI6dtlHY+G/jfKa/+Ewv6MvmwLiqoE=
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=
Expand Down
2 changes: 1 addition & 1 deletion exporter/sentryexporter/sentry_exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ func convertToSentrySpan(span pdata.Span, library pdata.InstrumentationLibrary,
}

sentrySpan = &sentry.Span{
TraceID: span.TraceID().String(),
TraceID: span.TraceID().HexString(),
SpanID: span.SpanID().String(),
ParentSpanID: parentSpanID,
Description: description,
Expand Down
2 changes: 1 addition & 1 deletion exporter/sentryexporter/sentry_exporter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ func TestSpanToSentrySpan(t *testing.T) {
testSpan := pdata.NewSpan()
testSpan.InitEmpty()

traceID := []byte{1, 2, 3, 4, 5, 6, 7, 8, 8, 7, 6, 5, 4, 3, 2, 1}
traceID := pdata.NewTraceID([]byte{1, 2, 3, 4, 5, 6, 7, 8, 8, 7, 6, 5, 4, 3, 2, 1})
spanID := []byte{1, 2, 3, 4, 5, 6, 7, 8}
parentSpanID := []byte{8, 7, 6, 5, 4, 3, 2, 1}
name := "span_name"
Expand Down
2 changes: 1 addition & 1 deletion exporter/signalfxexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.0.0-00010101000000-000000000000
github.com/signalfx/com_signalfx_metrics_protobuf v0.0.2
github.com/stretchr/testify v1.6.1
go.opentelemetry.io/collector v0.11.0
go.opentelemetry.io/collector v0.11.1-0.20200924160956-8690937037da
go.uber.org/multierr v1.5.0
go.uber.org/zap v1.16.0
google.golang.org/protobuf v1.25.0
Expand Down
Loading