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

Jump to bottom

Upgrade core, fix usage of deprecated Config.Validate #16362

Merged
merged 1 commit into from
Nov 18, 2022
Merged

Upgrade core, fix usage of deprecated Config.Validate #16362

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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ linters-settings:
# TODO: Enable this and fix the alignment issues.
disable:
- fieldalignment
- loopclosure

revive:
# minimal confidence for issues, default is 0.8
Expand Down
26 changes: 15 additions & 11 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,9 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib v0.64.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.64.0
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd
go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221115155901-1550938c18fd
go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7
go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7
go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221117234814-4565692c50a7
golang.org/x/mod v0.6.0
golang.org/x/text v0.4.0
)
Expand Down Expand Up @@ -590,21 +591,24 @@ require (
go.mongodb.org/atlas v0.19.0 // indirect
go.mongodb.org/mongo-driver v1.10.3 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector/exporter/loggingexporter v0.64.2-0.20221115155901-1550938c18fd // indirect
go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221115155901-1550938c18fd // indirect
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.64.2-0.20221115155901-1550938c18fd // indirect
go.opentelemetry.io/collector/extension/ballastextension v0.64.2-0.20221115155901-1550938c18fd // indirect
go.opentelemetry.io/collector/extension/zpagesextension v0.64.2-0.20221115155901-1550938c18fd // indirect
go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect
go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd // indirect
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.64.2-0.20221115155901-1550938c18fd // indirect
go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd // indirect
go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect
go.opentelemetry.io/collector/exporter/loggingexporter v0.64.2-0.20221117234814-4565692c50a7 // indirect
go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221117234814-4565692c50a7 // indirect
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.64.2-0.20221117234814-4565692c50a7 // indirect
go.opentelemetry.io/collector/extension/ballastextension v0.64.2-0.20221117234814-4565692c50a7 // indirect
go.opentelemetry.io/collector/extension/zpagesextension v0.64.2-0.20221117234814-4565692c50a7 // indirect
go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect
go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect
go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 // indirect
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.64.2-0.20221117234814-4565692c50a7 // indirect
go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect
go.opentelemetry.io/contrib/zpages v0.36.4 // indirect
go.opentelemetry.io/otel v1.11.1 // indirect
go.opentelemetry.io/otel/metric v0.33.0 // indirect
go.opentelemetry.io/otel/sdk v1.11.1 // indirect
go.opentelemetry.io/otel/sdk/metric v0.33.0 // indirect
go.opentelemetry.io/otel/trace v1.11.1 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/goleak v1.2.0 // indirect
Expand Down
52 changes: 30 additions & 22 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.

5 changes: 3 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.11.1
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd
go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd
go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7
go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7
)

require (
Expand All @@ -26,6 +26,7 @@ require (
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
go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
golang.org/x/crypto v0.0.0-20220507011949-2cf3adece122 // indirect
Expand Down
10 changes: 6 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.

3 changes: 2 additions & 1 deletion confmap/provider/s3provider/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/aws/aws-sdk-go-v2/config v1.18.0
github.com/aws/aws-sdk-go-v2/service/s3 v1.19.0
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd
go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7
gopkg.in/yaml.v2 v2.4.0
)

Expand All @@ -31,6 +31,7 @@ require (
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
6 changes: 4 additions & 2 deletions confmap/provider/s3provider/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion exporter/alibabacloudlogserviceexporter/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func TestLoadConfig(t *testing.T) {
require.NoError(t, err)
require.NoError(t, component.UnmarshalExporterConfig(sub, cfg))

assert.NoError(t, cfg.Validate())
assert.NoError(t, component.ValidateConfig(cfg))
assert.Equal(t, tt.expected, cfg)
})
}
Expand Down
9 changes: 6 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,9 +7,10 @@ require (
github.com/gogo/protobuf v1.3.2
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd
go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd
go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd
go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7
go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7
go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7
go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7
go.uber.org/zap v1.23.0
)

Expand All @@ -31,6 +32,8 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect
go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect
go.opentelemetry.io/otel v1.11.1 // indirect
go.opentelemetry.io/otel/metric v0.33.0 // indirect
go.opentelemetry.io/otel/trace v1.11.1 // indirect
Expand Down
Loading