Skip to content

Commit

Permalink
Deprecate component.ValidateConfig
Browse files Browse the repository at this point in the history
  • Loading branch information
@sincejune
sincejune committed Feb 10, 2025
1 parent bf0041f commit 398ceed
Show file tree
Hide file tree
Showing 572 changed files with 1,081 additions and 532 deletions.
2 changes: 1 addition & 1 deletion connector/datadogconnector/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ require (
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.1-0.20250210123122-44b3eeda354c // indirect
go.opentelemetry.io/collector/confmap/provider/httpprovider v1.25.1-0.20250210123122-44b3eeda354c // indirect
go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.25.1-0.20250210123122-44b3eeda354c // indirect
go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 // indirect
go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 // indirect
go.opentelemetry.io/collector/connector/xconnector v0.119.1-0.20250210123122-44b3eeda354c // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c // indirect
go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.119.1-0.20250210123122-44b3eeda354c // indirect
Expand Down
4 changes: 2 additions & 2 deletions connector/datadogconnector/go.sum
View file

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

3 changes: 2 additions & 1 deletion connector/exceptionsconnector/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/confmap/confmaptest"
"go.opentelemetry.io/collector/confmap/xconfmap"

"github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector/internal/metadata"
)
Expand Down Expand Up @@ -52,7 +53,7 @@ func TestLoadConfig(t *testing.T) {
require.NoError(t, err)
err = sub.Unmarshal(cfg)
assert.NoError(t, err)
assert.NoError(t, component.ValidateConfig(cfg))
assert.NoError(t, xconfmap.Validate(cfg))
assert.Equal(t, tt.expected, cfg)
})
}
Expand Down
1 change: 1 addition & 0 deletions connector/exceptionsconnector/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ require (
go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1
go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c
Expand Down
2 changes: 2 additions & 0 deletions connector/exceptionsconnector/go.sum
View file

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

5 changes: 3 additions & 2 deletions connector/failoverconnector/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/confmap/confmaptest"
"go.opentelemetry.io/collector/confmap/xconfmap"
"go.opentelemetry.io/collector/pipeline"

"github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector/internal/metadata"
Expand Down Expand Up @@ -72,7 +73,7 @@ func TestLoadConfig(t *testing.T) {
require.NoError(t, err)
require.NoError(t, sub.Unmarshal(cfg))

assert.NoError(t, component.ValidateConfig(cfg))
assert.NoError(t, xconfmap.Validate(cfg))
assert.Equal(t, tc.expected, cfg)
})
}
Expand Down Expand Up @@ -109,7 +110,7 @@ func TestValidateConfig(t *testing.T) {
require.NoError(t, err)
require.NoError(t, sub.Unmarshal(cfg))

assert.ErrorContains(t, component.ValidateConfig(cfg), tc.err.Error())
assert.ErrorContains(t, xconfmap.Validate(cfg), tc.err.Error())
})
})
}
Expand Down
1 change: 1 addition & 0 deletions connector/failoverconnector/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ require (
go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1
go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c
Expand Down
2 changes: 2 additions & 0 deletions connector/failoverconnector/go.sum
View file

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

3 changes: 1 addition & 2 deletions connector/grafanacloudconnector/internal/metadata/generated_telemetry.go
View file

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

5 changes: 2 additions & 3 deletions connector/grafanacloudconnector/internal/metadata/generated_telemetry_test.go
View file

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

3 changes: 1 addition & 2 deletions connector/grafanacloudconnector/internal/metadatatest/generated_telemetrytest_test.go
View file

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

7 changes: 4 additions & 3 deletions connector/routingconnector/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/confmap/confmaptest"
"go.opentelemetry.io/collector/confmap/xconfmap"
"go.opentelemetry.io/collector/pipeline"

"github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector/internal/metadata"
Expand Down Expand Up @@ -112,7 +113,7 @@ func TestLoadConfig(t *testing.T) {
require.NoError(t, err)
require.NoError(t, sub.Unmarshal(cfg))

assert.NoError(t, component.ValidateConfig(cfg))
assert.NoError(t, xconfmap.Validate(cfg))
assert.Equal(t, tt.expected, cfg)
})
}
Expand Down Expand Up @@ -379,9 +380,9 @@ func TestValidateConfig(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if tt.error == "" {
assert.NoError(t, component.ValidateConfig(tt.config))
assert.NoError(t, xconfmap.Validate(tt.config))
} else {
assert.EqualError(t, component.ValidateConfig(tt.config), tt.error)
assert.EqualError(t, xconfmap.Validate(tt.config), tt.error)
}
})
}
Expand Down
1 change: 1 addition & 0 deletions connector/routingconnector/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ require (
go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1
go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c
Expand Down
2 changes: 2 additions & 0 deletions connector/routingconnector/go.sum
View file

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

3 changes: 1 addition & 2 deletions connector/servicegraphconnector/internal/metadata/generated_telemetry.go
View file

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

5 changes: 2 additions & 3 deletions connector/servicegraphconnector/internal/metadata/generated_telemetry_test.go
View file

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

3 changes: 1 addition & 2 deletions connector/servicegraphconnector/internal/metadatatest/generated_telemetrytest_test.go
View file

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

3 changes: 2 additions & 1 deletion connector/signaltometricsconnector/config/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/confmap/confmaptest"
"go.opentelemetry.io/collector/confmap/xconfmap"

"github.com/open-telemetry/opentelemetry-collector-contrib/connector/signaltometricsconnector/internal/metadata"
)
Expand Down Expand Up @@ -179,7 +180,7 @@ func TestConfig(t *testing.T) {
require.NoError(t, err)
require.NoError(t, sub.Unmarshal(&cfg))

err = component.ValidateConfig(cfg)
err = xconfmap.Validate(cfg)
if len(tc.errorMsgs) > 0 {
for _, errMsg := range tc.errorMsgs {
assert.ErrorContains(t, err, errMsg)
Expand Down
3 changes: 2 additions & 1 deletion connector/signaltometricsconnector/connector_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/confmap"
"go.opentelemetry.io/collector/confmap/confmaptest"
"go.opentelemetry.io/collector/confmap/xconfmap"
"go.opentelemetry.io/collector/connector"
"go.opentelemetry.io/collector/connector/connectortest"
"go.opentelemetry.io/collector/consumer"
Expand Down Expand Up @@ -297,7 +298,7 @@ func setupConnector(
sub, err := cm.Sub(component.NewIDWithName(metadata.Type, "").String())
require.NoError(t, err)
require.NoError(t, sub.Unmarshal(&cfg))
require.NoError(t, component.ValidateConfig(cfg))
require.NoError(t, xconfmap.Validate(cfg))

return factory, settings, cfg
}
Expand Down
1 change: 1 addition & 0 deletions connector/signaltometricsconnector/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ require (
go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1
go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c
Expand Down
2 changes: 2 additions & 0 deletions connector/signaltometricsconnector/go.sum
View file

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

5 changes: 3 additions & 2 deletions connector/spanmetricsconnector/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/confmap/confmaptest"
"go.opentelemetry.io/collector/confmap/xconfmap"
"go.opentelemetry.io/collector/pdata/pmetric"

"github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector/internal/metadata"
Expand Down Expand Up @@ -176,11 +177,11 @@ func TestLoadConfig(t *testing.T) {
err = sub.Unmarshal(cfg)

if tt.expected == nil {
err = errors.Join(err, component.ValidateConfig(cfg))
err = errors.Join(err, xconfmap.Validate(cfg))
assert.ErrorContains(t, err, tt.errorMessage)
return
}
assert.NoError(t, component.ValidateConfig(cfg))
assert.NoError(t, xconfmap.Validate(cfg))
assert.Equal(t, tt.expected, cfg)
if tt.extraAssertions != nil {
tt.extraAssertions(cfg.(*Config))
Expand Down
1 change: 1 addition & 0 deletions connector/spanmetricsconnector/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ require (
go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1
go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c
Expand Down
2 changes: 2 additions & 0 deletions connector/spanmetricsconnector/go.sum
View file

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

3 changes: 2 additions & 1 deletion exporter/alertmanagerexporter/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
"go.opentelemetry.io/collector/config/configretry"
"go.opentelemetry.io/collector/config/configtls"
"go.opentelemetry.io/collector/confmap/confmaptest"
"go.opentelemetry.io/collector/confmap/xconfmap"
"go.opentelemetry.io/collector/exporter/exporterhelper"

"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter/internal/metadata"
Expand Down Expand Up @@ -92,7 +93,7 @@ func TestLoadConfig(t *testing.T) {
require.NoError(t, err)
require.NoError(t, sub.Unmarshal(cfg))

assert.NoError(t, component.ValidateConfig(cfg))
assert.NoError(t, xconfmap.Validate(cfg))
assert.Equal(t, tt.expected, cfg)
})
}
Expand Down
1 change: 1 addition & 0 deletions exporter/alertmanagerexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ require (
go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1
go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c
go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c
Expand Down
Loading

0 comments on commit 398ceed

Please sign in to comment.