Skip to content

Commit e477c3a

Browse files
authored
[confmap] Mark confmap.strictlyTypedInput as stable (#10793)
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description <!-- Issue number if applicable --> Marks `confmap.strictlyTypedInput` as stable. #### Link to tracking issue Fixes #10552 Blocked by: - #10794 - #10795
1 parent d2ed276 commit e477c3a

File tree

80 files changed

+50
-902
lines changed

Some content is hidden

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

80 files changed

+50
-902
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: breaking
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: confmap
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Mark `confmap.strictlyTypedInput` as stable
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [10552]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: []

cmd/mdatagen/go.mod

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ require (
3232
github.com/go-viper/mapstructure/v2 v2.1.0 // 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
@@ -48,8 +47,6 @@ require (
4847
github.com/prometheus/common v0.55.0 // indirect
4948
github.com/prometheus/procfs v0.15.1 // indirect
5049
go.opentelemetry.io/collector/consumer/consumerprofiles v0.107.0 // indirect
51-
go.opentelemetry.io/collector/featuregate v1.13.0 // indirect
52-
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
5350
go.opentelemetry.io/collector/pdata/pprofile v0.107.0 // indirect
5451
go.opentelemetry.io/otel v1.28.0 // indirect
5552
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
@@ -95,8 +92,6 @@ retract (
9592

9693
replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile
9794

98-
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
99-
10095
replace go.opentelemetry.io/collector/consumer/consumerprofiles => ../../consumer/consumerprofiles
10196

10297
replace go.opentelemetry.io/collector/consumer/consumertest => ../../consumer/consumertest

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.

config/configauth/go.mod

Lines changed: 0 additions & 7 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.1.0 // 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,8 +22,6 @@ require (
2322
github.com/pmezard/go-difflib v1.0.0 // indirect
2423
go.opentelemetry.io/collector/config/configtelemetry v0.107.0 // indirect
2524
go.opentelemetry.io/collector/confmap v0.107.0 // indirect
26-
go.opentelemetry.io/collector/featuregate v1.13.0 // indirect
27-
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
2825
go.opentelemetry.io/collector/pdata v1.13.0 // indirect
2926
go.opentelemetry.io/otel v1.28.0 // indirect
3027
go.opentelemetry.io/otel/metric v1.28.0 // indirect
@@ -52,8 +49,4 @@ replace go.opentelemetry.io/collector/extension => ../../extension
5249

5350
replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth
5451

55-
replace go.opentelemetry.io/collector/featuregate => ../../featuregate
56-
57-
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
58-
5952
replace go.opentelemetry.io/collector/component/componentstatus => ../../component/componentstatus

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/configgrpc/go.mod

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ require (
5555
github.com/prometheus/procfs v0.15.1 // indirect
5656
go.opentelemetry.io/collector/confmap v0.107.0 // indirect
5757
go.opentelemetry.io/collector/extension v0.107.0 // indirect
58-
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
5958
go.opentelemetry.io/collector/pdata/pprofile v0.107.0 // indirect
6059
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
6160
go.opentelemetry.io/otel/metric v1.28.0 // indirect
@@ -73,8 +72,6 @@ require (
7372

7473
replace go.opentelemetry.io/collector => ../../
7574

76-
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
77-
7875
replace go.opentelemetry.io/collector/client => ../../client
7976

8077
replace go.opentelemetry.io/collector/config/configauth => ../configauth

config/confighttp/go.mod

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ require (
5050
github.com/prometheus/procfs v0.15.1 // indirect
5151
go.opentelemetry.io/collector/confmap v0.107.0 // indirect
5252
go.opentelemetry.io/collector/extension v0.107.0 // indirect
53-
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
5453
go.opentelemetry.io/collector/pdata v1.13.0 // indirect
5554
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
5655
go.opentelemetry.io/otel/metric v1.28.0 // indirect
@@ -68,8 +67,6 @@ require (
6867

6968
replace go.opentelemetry.io/collector => ../../
7069

71-
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
72-
7370
replace go.opentelemetry.io/collector/config/configauth => ../configauth
7471

7572
replace go.opentelemetry.io/collector/config/configcompression => ../configcompression

config/internal/go.mod

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ replace go.opentelemetry.io/collector/pdata/testdata => ../../pdata/testdata
3636

3737
replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile
3838

39-
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
40-
4139
replace go.opentelemetry.io/collector/consumer/consumerprofiles => ../../consumer/consumerprofiles
4240

4341
replace go.opentelemetry.io/collector/consumer/consumertest => ../../consumer/consumertest

confmap/confmap.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"github.com/knadh/koanf/v2"
1818

1919
encoder "go.opentelemetry.io/collector/confmap/internal/mapstructure"
20-
"go.opentelemetry.io/collector/internal/globalgates"
2120
)
2221

2322
const (
@@ -187,7 +186,7 @@ func decodeConfig(m *Conf, result any, errorUnused bool, skipTopLevelUnmarshaler
187186
ErrorUnused: errorUnused,
188187
Result: result,
189188
TagName: "mapstructure",
190-
WeaklyTypedInput: !globalgates.StrictlyTypedInputGate.IsEnabled(),
189+
WeaklyTypedInput: false,
191190
MatchName: caseSensitiveMatchName,
192191
DecodeHook: mapstructure.ComposeDecodeHookFunc(
193192
useExpandValue(),
@@ -239,7 +238,7 @@ func caseSensitiveMatchName(a, b string) bool {
239238

240239
func castTo(exp expandedValue, useOriginal bool) (any, error) {
241240
// If the target field is a string, use `exp.Original` or fail if not available.
242-
if globalgates.StrictlyTypedInputGate.IsEnabled() && useOriginal {
241+
if useOriginal {
243242
return exp.Original, nil
244243
}
245244
// Otherwise, use the parsed value (previous behavior).

confmap/converter/expandconverter/go.mod

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,14 @@ require (
1414
require (
1515
github.com/davecgh/go-spew v1.1.1 // indirect
1616
github.com/go-viper/mapstructure/v2 v2.1.0 // 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
2120
github.com/mitchellh/copystructure v1.2.0 // indirect
2221
github.com/mitchellh/reflectwalk v1.0.2 // indirect
2322
github.com/pmezard/go-difflib v1.0.0 // indirect
24-
go.opentelemetry.io/collector/featuregate v1.13.0 // indirect
25-
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
2623
go.uber.org/multierr v1.11.0 // indirect
2724
gopkg.in/yaml.v3 v3.0.1 // indirect
2825
)
2926

3027
replace go.opentelemetry.io/collector/confmap => ../..
31-
32-
replace go.opentelemetry.io/collector/featuregate => ../../../featuregate
33-
34-
replace go.opentelemetry.io/collector/internal/globalgates => ../../../internal/globalgates

0 commit comments

Comments
 (0)