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

[chore] Don't use result of [SpanKind|StatusCode].String as identifiers #16021

Merged
merged 1 commit into from
Nov 2, 2022
Merged

[chore] Don't use result of [SpanKind|StatusCode].String as identifiers #16021

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 cmd/configschema/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver v0.63.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/iisreceiver v0.63.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.63.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.0.0-00010101000000-000000000000 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.63.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-00010101000000-000000000000 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.63.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.63.0 // indirect
Expand Down
7 changes: 5 additions & 2 deletions exporter/azuredataexplorerexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ require (
github.com/Azure/azure-kusto-go v0.8.1
github.com/Azure/go-autorest/autorest/azure/auth v0.5.11
github.com/json-iterator/go v1.1.12
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-00010101000000-000000000000
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.63.2-0.20221101161158-df8deb48186b
go.opentelemetry.io/collector/pdata v0.63.2-0.20221101161158-df8deb48186b
Expand Down Expand Up @@ -52,11 +53,13 @@ require (
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e // indirect
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect
golang.org/x/text v0.4.0 // indirect
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc // indirect
google.golang.org/grpc v1.50.1 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
23 changes: 6 additions & 17 deletions exporter/azuredataexplorerexporter/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions exporter/azuredataexplorerexporter/tracesdata_to_adx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import (

"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/ptrace"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/traceutil"
)

type AdxTrace struct {
Expand Down Expand Up @@ -60,8 +62,8 @@ func mapToAdxTrace(resource pcommon.Resource, scope pcommon.InstrumentationScope
SpanID: spanData.SpanID().HexString(),
ParentID: spanData.ParentSpanID().HexString(),
SpanName: spanData.Name(),
SpanStatus: spanData.Status().Code().String(),
SpanKind: spanData.Kind().String(),
SpanStatus: traceutil.StatusCodeStr(spanData.Status().Code()),
SpanKind: traceutil.SpanKindStr(spanData.Kind()),
StartTime: spanData.StartTimestamp().AsTime().Format(time.RFC3339),
EndTime: spanData.EndTimestamp().AsTime().Format(time.RFC3339),
ResourceAttributes: resource.Attributes().AsRaw(),
Expand Down
10 changes: 5 additions & 5 deletions exporter/azuremonitorexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ go 1.18

require (
github.com/microsoft/ApplicationInsights-Go v0.4.4
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-00010101000000-000000000000
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.63.2-0.20221101161158-df8deb48186b
go.opentelemetry.io/collector/pdata v0.63.2-0.20221101161158-df8deb48186b
go.opentelemetry.io/collector/semconv v0.63.2-0.20221101161158-df8deb48186b
go.uber.org/zap v1.23.0
golang.org/x/net v0.0.0-20220225172249-27dd8689420f
golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e
)

require (
code.cloudfoundry.org/clock v1.0.0 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/gofrs/uuid v4.0.0+incompatible // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
Expand All @@ -28,7 +28,6 @@ require (
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pelletier/go-toml v1.9.4 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/objx v0.5.0 // indirect
go.opencensus.io v0.23.0 // indirect
Expand All @@ -39,9 +38,10 @@ require (
go.uber.org/multierr v1.8.0 // indirect
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect
golang.org/x/text v0.4.0 // indirect
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc // indirect
google.golang.org/grpc v1.50.1 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
Loading