Skip to content

[chore] Pull fix for validate subcommand #4873

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

Merged
merged 1 commit into from
May 23, 2024
Merged

[chore] Pull fix for validate subcommand #4873

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
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ require (
go.opentelemetry.io/collector/extension v0.101.0
go.opentelemetry.io/collector/extension/ballastextension v0.101.0
go.opentelemetry.io/collector/extension/zpagesextension v0.101.0
go.opentelemetry.io/collector/otelcol v0.101.0
go.opentelemetry.io/collector/otelcol v0.101.1-0.20240522182134-4f365892b751
go.opentelemetry.io/collector/pdata v1.8.0
go.opentelemetry.io/collector/processor v0.101.0
go.opentelemetry.io/collector/processor/batchprocessor v0.101.0
Expand Down Expand Up @@ -311,7 +311,7 @@ require (
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.101.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.101.0 // indirect
go.opentelemetry.io/collector/filter v0.101.0 // indirect
go.opentelemetry.io/collector/service v0.101.0 // indirect
go.opentelemetry.io/collector/service v0.101.1-0.20240522182134-4f365892b751 // indirect
go.opentelemetry.io/contrib/config v0.6.0 // indirect
go.opentelemetry.io/otel/bridge/opencensus v1.27.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1880,8 +1880,8 @@ go.opentelemetry.io/collector/featuregate v1.8.0 h1:p/bAuk5LiSfdYS88yFl/Jzao9bHE
go.opentelemetry.io/collector/featuregate v1.8.0/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w=
go.opentelemetry.io/collector/filter v0.101.0 h1:tNs6+liajg4hxSmtX5tcuGBefSPB+TEyyK3KTPp+dYY=
go.opentelemetry.io/collector/filter v0.101.0/go.mod h1:Kp9rCRB60SDm+pjrsaK95fkwfEXGh4j1yewvATTNkfI=
go.opentelemetry.io/collector/otelcol v0.101.0 h1:6kF2dcXpu5NjxK2j0ksCRzZhqigxCGrP/u7n57FSMOg=
go.opentelemetry.io/collector/otelcol v0.101.0/go.mod h1:qGrb+hlZXId/hJj0y28vq0YkMd6Xsoz2w7mZkXJOw68=
go.opentelemetry.io/collector/otelcol v0.101.1-0.20240522182134-4f365892b751 h1:lW37bLhUThP+ka1DSu1OGmM76INIrAvVofcNvOXhy8w=
go.opentelemetry.io/collector/otelcol v0.101.1-0.20240522182134-4f365892b751/go.mod h1:/gdhzzo+4ycaBX8onnmBq9wLj9KrWqENkWMNAUIvFCg=
go.opentelemetry.io/collector/pdata v1.8.0 h1:d/QQgZxB4Y+d3mqLVh2ozvzujUhloD3P/fk7X+In764=
go.opentelemetry.io/collector/pdata v1.8.0/go.mod h1:/W7clu0wFC4WSRp94Ucn6Vm36Wkrt+tmtlDb1aiNZCY=
go.opentelemetry.io/collector/pdata/testdata v0.101.0 h1:JzeUtg5RN1iIFgY8DakGlqBkGxOTJlkaYlLausnEGKY=
Expand All @@ -1898,8 +1898,8 @@ go.opentelemetry.io/collector/receiver/otlpreceiver v0.101.0 h1:CEu8qgxIyy7C66f+
go.opentelemetry.io/collector/receiver/otlpreceiver v0.101.0/go.mod h1:gektz6Q5R2ooWgQDa4ufdpJdD+M1/062hHQerea3VKQ=
go.opentelemetry.io/collector/semconv v0.101.0 h1:tOe9iTe9dDCnvz/bqgfNRr4w80kXG8505tQJ5h5v08Q=
go.opentelemetry.io/collector/semconv v0.101.0/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A=
go.opentelemetry.io/collector/service v0.101.0 h1:My2NrH25WYmJ6vMWwT3csglyiTkf0XP3nPgj0mX1yFw=
go.opentelemetry.io/collector/service v0.101.0/go.mod h1:XowYC9FyNGmWClh0aObztKdTfQNLAr6mubpvh27ee+Q=
go.opentelemetry.io/collector/service v0.101.1-0.20240522182134-4f365892b751 h1:6hSS2k6Pz7OIxoTo8GfCPgL0C9y5tcPJzZ3unyGluh0=
go.opentelemetry.io/collector/service v0.101.1-0.20240522182134-4f365892b751/go.mod h1:1g0N4lE7ICzUEYGi/9B56tZa52ASVJpr3KxWP4RyYls=
go.opentelemetry.io/contrib/config v0.6.0 h1:M1SRD1Z15XHPGk61tMLI1up77XT5FdrqQSRrlH0fYuk=
go.opentelemetry.io/contrib/config v0.6.0/go.mod h1:t+/kzmRWLN7J+4F/dD4fFvlYCmCO63WYwy/B00IC++c=
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0 h1:A3SayB3rNyt+1S6qpI9mHPkeHTZbD7XILEqWnYZb2l0=
Expand Down
3 changes: 0 additions & 3 deletions tests/general/validate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
)

func TestCoreValidateDefaultConfig(t *testing.T) {
t.Skip("Skip until https://github.com/open-telemetry/opentelemetry-collector/pull/10203 is merged")
tc := testutils.NewTestcase(t)
defer tc.PrintLogsOnFailure()
defer tc.ShutdownOTLPReceiverSink()
Expand Down Expand Up @@ -65,7 +64,6 @@ func TestCoreValidateDefaultConfig(t *testing.T) {
}

func TestCoreValidateYamlProvider(t *testing.T) {
t.Skip("Skip until https://github.com/open-telemetry/opentelemetry-collector/pull/10203 is merged")
tc := testutils.NewTestcase(t)
defer tc.PrintLogsOnFailure()
defer tc.ShutdownOTLPReceiverSink()
Expand Down Expand Up @@ -113,7 +111,6 @@ service:
}

func TestCoreValidateDetectsInvalidYamlProvider(t *testing.T) {
t.Skip("Skip until https://github.com/open-telemetry/opentelemetry-collector/pull/10203 is merged")
tc := testutils.NewTestcase(t)
defer tc.PrintLogsOnFailure()
defer tc.ShutdownOTLPReceiverSink()
Expand Down