Skip to content

Commit 8c15315

Browse files
committed
fix: remove deprecated expandconverter
The expandconverter is deprecated as of 0.107.0 and leaving it enabled causes issues with the parsing of environment variables. For example, when supplying an identifier like '1234' to a string field through an environment variable, this would incorrectly be treated as an integer and fail validation. Signed-off-by: Dominik Süß <[email protected]>
1 parent 43d45e4 commit 8c15315

File tree

3 files changed

+0
-5
lines changed

3 files changed

+0
-5
lines changed

collector/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ require (
2828
github.com/stretchr/testify v1.9.0
2929
go.opentelemetry.io/collector/component v0.112.0
3030
go.opentelemetry.io/collector/confmap v1.18.0
31-
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.112.0
3231
go.opentelemetry.io/collector/confmap/provider/envprovider v1.18.0
3332
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.18.0
3433
go.opentelemetry.io/collector/confmap/provider/httpprovider v1.18.0

collector/go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,6 @@ go.opentelemetry.io/collector/config/internal v0.112.0 h1:kB28u5IrrJIsKKHFltBSAr
279279
go.opentelemetry.io/collector/config/internal v0.112.0/go.mod h1:yC7E4h1Uj0SubxcFImh6OvBHFTjMh99+A5PuyIgDWqc=
280280
go.opentelemetry.io/collector/confmap v1.18.0 h1:UEOeJY8RW8lZ1O4lzHSGqolS7uzkpXQi5fa8SidKqQg=
281281
go.opentelemetry.io/collector/confmap v1.18.0/go.mod h1:GgNu1ElPGmLn9govqIfjaopvdspw4PJ9KeDtWC4E2Q4=
282-
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.112.0 h1:OsoXXLq+esPFSLZm+ar/0XjR5p7Am4WTSXIth9Wpa38=
283-
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.112.0/go.mod h1:BQdUghbxnpSYai6VBm6SsedndXVC9vlGM2N1Fc/0rnk=
284282
go.opentelemetry.io/collector/confmap/provider/envprovider v1.18.0 h1:ZWEsXeCbNUP4GXRvlkVXBpqIH9rNtnk1knZDORo/7zA=
285283
go.opentelemetry.io/collector/confmap/provider/envprovider v1.18.0/go.mod h1:76mYXizxjo8rcRsvyTuNtPykVuqmZWGcV6lGs7+++J8=
286284
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.18.0 h1:eTDRt5w/bTaTWOY/satyprh/7V0zkwLKvm6NQuJ/L+8=

collector/internal/collector/collector.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider"
2424
"go.opentelemetry.io/collector/component"
2525
"go.opentelemetry.io/collector/confmap"
26-
"go.opentelemetry.io/collector/confmap/converter/expandconverter"
2726
"go.opentelemetry.io/collector/confmap/provider/envprovider"
2827
"go.opentelemetry.io/collector/confmap/provider/fileprovider"
2928
"go.opentelemetry.io/collector/confmap/provider/httpprovider"
@@ -76,7 +75,6 @@ func NewCollector(logger *zap.Logger, factories otelcol.Factories, version strin
7675
URIs: []string{getConfig(l)},
7776
ProviderFactories: []confmap.ProviderFactory{fileprovider.NewFactory(), envprovider.NewFactory(), yamlprovider.NewFactory(), httpprovider.NewFactory(), s3provider.NewFactory(), secretsmanagerprovider.NewFactory()},
7877
ConverterFactories: []confmap.ConverterFactory{
79-
expandconverter.NewFactory(),
8078
confmap.NewConverterFactory(func(set confmap.ConverterSettings) confmap.Converter {
8179
return disablequeuedretryconverter.New()
8280
}),

0 commit comments

Comments
 (0)