Skip to content

Commit e8a88ff

Browse files
TylerHelmuthTylerHelmuth
committed
move featuregate to otelcol
1 parent 50bf50a commit e8a88ff

File tree

63 files changed

+56
-203
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+56
-203
lines changed

‎.chloggen/confmap-add-expand-featuregate.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ change_type: enhancement
77
component: confmap
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: Add `confmap.useStableExpansionRules` feature gate to allow enabling stable expansion rules.
10+
note: Add `otelcol.useStableExpansionRules` feature gate to allow enabling stable expansion rules.
1111

1212
# One or more tracking issues or pull requests related to the change
1313
issues: [10259]

‎cmd/builder/internal/builder/templates/main.go.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func main() {
4141
}
4242

4343
{{ if .Distribution.SupportsConfmapFactories }}
44-
if confmap.UseStableExpansionRules.IsEnabled() {
44+
if otelcol.UseStableExpansionRules.IsEnabled() {
4545
set.ConfigProviderSettings.ResolverSettings.DefaultScheme = "env"
4646
} else {
4747
set.ConfigProviderSettings.ResolverSettings.ConverterFactories = []confmap.ConverterFactory{

‎cmd/mdatagen/go.mod

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ require (
3232
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
3333
github.com/gogo/protobuf v1.3.2 // indirect
3434
github.com/google/uuid v1.6.0 // indirect
35-
github.com/hashicorp/go-version v1.7.0 // indirect
3635
github.com/json-iterator/go v1.1.12 // indirect
3736
github.com/knadh/koanf/maps v0.1.1 // indirect
3837
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
@@ -46,7 +45,6 @@ require (
4645
github.com/prometheus/client_model v0.6.1 // indirect
4746
github.com/prometheus/common v0.53.0 // indirect
4847
github.com/prometheus/procfs v0.15.0 // indirect
49-
go.opentelemetry.io/collector/featuregate v1.8.0 // indirect
5048
go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect
5149
go.opentelemetry.io/otel/sdk v1.27.0 // indirect
5250
go.uber.org/multierr v1.11.0 // indirect

‎cmd/mdatagen/go.sum

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/otelcorecol/main.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎component/go.mod

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,13 @@ require (
2929
github.com/go-logr/stdr v1.2.2 // indirect
3030
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
3131
github.com/gogo/protobuf v1.3.2 // indirect
32-
github.com/hashicorp/go-version v1.7.0 // indirect
3332
github.com/knadh/koanf/maps v0.1.1 // indirect
3433
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
3534
github.com/knadh/koanf/v2 v2.1.1 // indirect
3635
github.com/mitchellh/copystructure v1.2.0 // indirect
3736
github.com/mitchellh/reflectwalk v1.0.2 // indirect
3837
github.com/pmezard/go-difflib v1.0.0 // indirect
3938
github.com/prometheus/procfs v0.15.0 // indirect
40-
go.opentelemetry.io/collector/featuregate v1.8.0 // indirect
4139
golang.org/x/net v0.23.0 // indirect
4240
golang.org/x/sys v0.20.0 // indirect
4341
golang.org/x/text v0.14.0 // indirect
@@ -57,5 +55,3 @@ retract (
5755
v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module, use v0.76.1
5856
v0.69.0 // Release failed, use v0.69.1
5957
)
60-
61-
replace go.opentelemetry.io/collector/featuregate => ../featuregate

‎component/go.sum

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/configauth/go.mod

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ require (
1414
github.com/davecgh/go-spew v1.1.1 // indirect
1515
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
1616
github.com/gogo/protobuf v1.3.2 // indirect
17-
github.com/hashicorp/go-version v1.7.0 // indirect
1817
github.com/knadh/koanf/maps v0.1.1 // indirect
1918
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
2019
github.com/knadh/koanf/v2 v2.1.1 // indirect
@@ -23,7 +22,6 @@ require (
2322
github.com/pmezard/go-difflib v1.0.0 // indirect
2423
go.opentelemetry.io/collector/config/configtelemetry v0.101.0 // indirect
2524
go.opentelemetry.io/collector/confmap v0.101.0 // indirect
26-
go.opentelemetry.io/collector/featuregate v1.8.0 // indirect
2725
go.opentelemetry.io/collector/pdata v1.8.0 // indirect
2826
go.opentelemetry.io/otel v1.27.0 // indirect
2927
go.opentelemetry.io/otel/metric v1.27.0 // indirect
@@ -50,5 +48,3 @@ replace go.opentelemetry.io/collector/config/configtelemetry => ../configtelemet
5048
replace go.opentelemetry.io/collector/extension => ../../extension
5149

5250
replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth
53-
54-
replace go.opentelemetry.io/collector/featuregate => ../../featuregate

‎config/configauth/go.sum

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/configopaque/go.mod

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,17 @@ require (
1212
require (
1313
github.com/davecgh/go-spew v1.1.1 // indirect
1414
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
15-
github.com/hashicorp/go-version v1.7.0 // indirect
1615
github.com/knadh/koanf/maps v0.1.1 // indirect
1716
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
1817
github.com/knadh/koanf/v2 v2.1.1 // indirect
18+
github.com/kr/pretty v0.3.1 // indirect
1919
github.com/mitchellh/copystructure v1.2.0 // indirect
2020
github.com/mitchellh/reflectwalk v1.0.2 // indirect
2121
github.com/pmezard/go-difflib v1.0.0 // indirect
22-
go.opentelemetry.io/collector/featuregate v1.8.0 // indirect
22+
github.com/rogpeppe/go-internal v1.10.0 // indirect
2323
go.uber.org/multierr v1.11.0 // indirect
2424
go.uber.org/zap v1.27.0 // indirect
25+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
2526
)
2627

2728
replace go.opentelemetry.io/collector/confmap => ../../confmap
28-
29-
replace go.opentelemetry.io/collector/featuregate => ../../featuregate

0 commit comments

Comments
 (0)