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 otel core #8821

Merged
merged 2 commits into from
Mar 24, 2022
Merged

update otel core #8821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0019dfa
update otel core
Mar 23, 2022
8580ede
fix lint
Mar 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions cmd/configschema/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.47.0
github.com/stretchr/testify v1.7.1
go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d
go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d
go.opentelemetry.io/collector v0.47.1-0.20220323200141-1b7618728835
go.opentelemetry.io/collector/model v0.47.1-0.20220323200141-1b7618728835
go.uber.org/multierr v1.8.0
golang.org/x/mod v0.5.1
)
Expand Down
6 changes: 4 additions & 2 deletions cmd/configschema/go.sum
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions cmd/mdatagen/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ require (
github.com/go-playground/universal-translator v0.18.0
github.com/go-playground/validator/v10 v10.10.1
github.com/stretchr/testify v1.7.1
go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d
go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d
go.opentelemetry.io/collector v0.47.1-0.20220323200141-1b7618728835
go.opentelemetry.io/collector/model v0.47.1-0.20220323200141-1b7618728835
)

require (
Expand Down
8 changes: 4 additions & 4 deletions cmd/mdatagen/go.sum
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions cmd/mdatagen/loader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/go-playground/validator/v10"
"github.com/go-playground/validator/v10/non-standard/validators"
en_translations "github.com/go-playground/validator/v10/translations/en"
"go.opentelemetry.io/collector/config/configmapprovider"
"go.opentelemetry.io/collector/config/mapprovider/filemapprovider"
)

type metricName string
Expand Down Expand Up @@ -120,7 +120,7 @@ type templateContext struct {
}

func loadMetadata(filePath string) (metadata, error) {
cp, err := configmapprovider.NewFile().Retrieve(context.Background(), "file:"+filePath, nil)
cp, err := filemapprovider.New().Retrieve(context.Background(), "file:"+filePath, nil)
if err != nil {
return metadata{}, err
}
Expand Down
5 changes: 2 additions & 3 deletions exporter/alibabacloudlogserviceexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ require (
github.com/gogo/protobuf v1.3.2
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.47.0
github.com/stretchr/testify v1.7.1
go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d
go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d
go.opentelemetry.io/collector v0.47.1-0.20220323200141-1b7618728835
go.opentelemetry.io/collector/model v0.47.1-0.20220323200141-1b7618728835
go.uber.org/zap v1.21.0
)

Expand All @@ -20,7 +20,6 @@ require (
github.com/go-logfmt/logfmt v0.5.0 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/knadh/koanf v1.4.0 // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
Expand Down
10 changes: 4 additions & 6 deletions exporter/alibabacloudlogserviceexporter/go.sum
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions exporter/alibabacloudlogserviceexporter/logsdata_to_logservice_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func getComplexAttributeValueMap() pdata.Value {
mapValReal.InsertDouble("value", 1.3)
mapValReal.InsertInt("code", 200)
mapValReal.InsertNull("null")
arrayVal := pdata.NewValueArray()
arrayVal := pdata.NewValueSlice()
arrayVal.SliceVal().AppendEmpty().SetStringVal("array")
mapValReal.Insert("array", arrayVal)

Expand Down Expand Up @@ -75,7 +75,7 @@ func createLogData(numberOfLogs int) pdata.Logs {
logRecord.Attributes().Insert("map-value", getComplexAttributeValueMap())
logRecord.Body().SetStringVal("log contents")
case 6:
arrayVal := pdata.NewValueArray()
arrayVal := pdata.NewValueSlice()
arrayVal.SliceVal().AppendEmpty().SetStringVal("array")
logRecord.Attributes().Insert("array-value", arrayVal)
logRecord.Body().SetStringVal("log contents")
Expand Down
2 changes: 1 addition & 1 deletion exporter/awscloudwatchlogsexporter/exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ func attrValue(value pdata.Value) interface{} {
return true
})
return values
case pdata.ValueTypeArray:
case pdata.ValueTypeSlice:
arrayVal := value.SliceVal()
values := make([]interface{}, arrayVal.Len())
for i := 0; i < arrayVal.Len(); i++ {
Expand Down
2 changes: 1 addition & 1 deletion exporter/awscloudwatchlogsexporter/exporter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ func TestAttrValue(t *testing.T) {
{
name: "array",
builder: func() pdata.Value {
arrAttr := pdata.NewValueArray()
arrAttr := pdata.NewValueSlice()
arr := arrAttr.SliceVal()
for _, av := range []pdata.Value{
pdata.NewValueDouble(1.2),
Expand Down
5 changes: 2 additions & 3 deletions exporter/awscloudwatchlogsexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.47.0
github.com/stretchr/testify v1.7.1
go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d
go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d
go.opentelemetry.io/collector v0.47.1-0.20220323200141-1b7618728835
go.opentelemetry.io/collector/model v0.47.1-0.20220323200141-1b7618728835
go.uber.org/zap v1.21.0
)

Expand All @@ -19,7 +19,6 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/knadh/koanf v1.4.0 // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
Expand Down
10 changes: 4 additions & 6 deletions exporter/awscloudwatchlogsexporter/go.sum
View file
Open in desktop

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

5 changes: 2 additions & 3 deletions exporter/awsemfexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.47.0
github.com/stretchr/testify v1.7.1
go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d
go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d
go.opentelemetry.io/collector v0.47.1-0.20220323200141-1b7618728835
go.opentelemetry.io/collector/model v0.47.1-0.20220323200141-1b7618728835
go.uber.org/zap v1.21.0
google.golang.org/protobuf v1.27.1
)
Expand All @@ -27,7 +27,6 @@ require (
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/knadh/koanf v1.4.0 // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
Expand Down
10 changes: 4 additions & 6 deletions exporter/awsemfexporter/go.sum
View file
Open in desktop

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

5 changes: 2 additions & 3 deletions exporter/awskinesisexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.47.0
github.com/stretchr/testify v1.7.1
go.opentelemetry.io/collector v0.47.1-0.20220322153344-4c3b824aca1d
go.opentelemetry.io/collector/model v0.47.1-0.20220322153344-4c3b824aca1d
go.opentelemetry.io/collector v0.47.1-0.20220323200141-1b7618728835
go.opentelemetry.io/collector/model v0.47.1-0.20220323200141-1b7618728835
go.uber.org/zap v1.21.0
)

Expand All @@ -26,7 +26,6 @@ require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/knadh/koanf v1.4.0 // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
Expand Down
Loading