[chore] Rename internal/featuregates to internal/globalgates (#10614)

<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description

Fixes #10569. However, I think it's fine to just close the issue as
wontfix and not do this.
This commit is contained in:
Pablo Baeyens 2024-07-15 16:11:37 +02:00 committed by GitHub
parent 183926d284
commit 75aeab0f1d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
61 changed files with 123 additions and 123 deletions

View File

@ -290,7 +290,7 @@ check-contrib:
-replace go.opentelemetry.io/collector/extension/memorylimiterextension=$(CURDIR)/extension/memorylimiterextension \
-replace go.opentelemetry.io/collector/extension/zpagesextension=$(CURDIR)/extension/zpagesextension \
-replace go.opentelemetry.io/collector/featuregate=$(CURDIR)/featuregate \
-replace go.opentelemetry.io/collector/internal/featuregates=$(CURDIR)/internal/featuregates \
-replace go.opentelemetry.io/collector/internal/globalgates=$(CURDIR)/internal/globalgates \
-replace go.opentelemetry.io/collector/otelcol=$(CURDIR)/otelcol \
-replace go.opentelemetry.io/collector/otelcol/otelcoltest=$(CURDIR)/otelcol/otelcoltest \
-replace go.opentelemetry.io/collector/pdata=$(CURDIR)/pdata \
@ -349,7 +349,7 @@ restore-contrib:
-dropreplace go.opentelemetry.io/collector/extension/memorylimiterextension \
-dropreplace go.opentelemetry.io/collector/extension/zpagesextension \
-dropreplace go.opentelemetry.io/collector/featuregate \
-dropreplace go.opentelemetry.io/collector/internal/featuregates \
-dropreplace go.opentelemetry.io/collector/internal/globalgates \
-dropreplace go.opentelemetry.io/collector/otelcol \
-dropreplace go.opentelemetry.io/collector/otelcol/otelcoltest \
-dropreplace go.opentelemetry.io/collector/pdata \

View File

@ -69,7 +69,7 @@ var (
"/extension/auth",
"/extension/zpagesextension",
"/featuregate",
"/internal/featuregates",
"/internal/globalgates",
"/processor",
"/processor/batchprocessor",
"/processor/memorylimiterprocessor",

View File

@ -46,7 +46,7 @@ replaces:
- go.opentelemetry.io/collector/extension/auth => ${WORKSPACE_DIR}/extension/auth
- go.opentelemetry.io/collector/extension/zpagesextension => ${WORKSPACE_DIR}/extension/zpagesextension
- go.opentelemetry.io/collector/featuregate => ${WORKSPACE_DIR}/featuregate
- go.opentelemetry.io/collector/internal/featuregates => ${WORKSPACE_DIR}/internal/featuregates
- go.opentelemetry.io/collector/internal/globalgates => ${WORKSPACE_DIR}/internal/globalgates
- go.opentelemetry.io/collector/otelcol => ${WORKSPACE_DIR}/otelcol
- go.opentelemetry.io/collector/otelcol/otelcoltest => ${WORKSPACE_DIR}/otelcol/otelcoltest
- go.opentelemetry.io/collector/pdata => ${WORKSPACE_DIR}/pdata

View File

@ -48,7 +48,7 @@ require (
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
@ -92,4 +92,4 @@ retract (
replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile
replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates

View File

@ -41,7 +41,7 @@ providers:
replaces:
- go.opentelemetry.io/collector => ../../
- go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates
- go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
- go.opentelemetry.io/collector/otelcol => ../../otelcol
- go.opentelemetry.io/collector/component => ../../component
- go.opentelemetry.io/collector/config/configauth => ../../config/configauth

View File

@ -94,7 +94,7 @@ require (
go.opentelemetry.io/collector/consumer v0.104.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/pdata v1.11.0 // indirect
go.opentelemetry.io/collector/semconv v0.104.0 // indirect
go.opentelemetry.io/collector/service v0.104.0 // indirect
@ -136,7 +136,7 @@ require (
replace go.opentelemetry.io/collector => ../../
replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
replace go.opentelemetry.io/collector/otelcol => ../../otelcol

View File

@ -24,7 +24,7 @@ require (
go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect
go.opentelemetry.io/collector/confmap v0.104.0 // indirect
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/pdata v1.11.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect
@ -54,4 +54,4 @@ replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth
replace go.opentelemetry.io/collector/featuregate => ../../featuregate
replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates

View File

@ -54,7 +54,7 @@ require (
github.com/prometheus/procfs v0.15.1 // indirect
go.opentelemetry.io/collector/confmap v0.104.0 // indirect
go.opentelemetry.io/collector/extension v0.104.0 // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect
@ -72,7 +72,7 @@ require (
replace go.opentelemetry.io/collector => ../../
replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
replace go.opentelemetry.io/collector/config/configauth => ../configauth

View File

@ -49,7 +49,7 @@ require (
github.com/prometheus/procfs v0.15.1 // indirect
go.opentelemetry.io/collector/confmap v0.104.0 // indirect
go.opentelemetry.io/collector/extension v0.104.0 // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/pdata v1.11.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect
@ -67,7 +67,7 @@ require (
replace go.opentelemetry.io/collector => ../../
replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
replace go.opentelemetry.io/collector/config/configauth => ../configauth

View File

@ -36,4 +36,4 @@ replace go.opentelemetry.io/collector/pdata/testdata => ../../pdata/testdata
replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile
replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates

View File

@ -17,7 +17,7 @@ import (
"github.com/knadh/koanf/v2"
encoder "go.opentelemetry.io/collector/confmap/internal/mapstructure"
"go.opentelemetry.io/collector/internal/featuregates"
"go.opentelemetry.io/collector/internal/globalgates"
)
const (
@ -157,7 +157,7 @@ func decodeConfig(m *Conf, result any, errorUnused bool, skipTopLevelUnmarshaler
ErrorUnused: errorUnused,
Result: result,
TagName: "mapstructure",
WeaklyTypedInput: !featuregates.StrictlyTypedInputGate.IsEnabled(),
WeaklyTypedInput: !globalgates.StrictlyTypedInputGate.IsEnabled(),
MatchName: caseSensitiveMatchName,
DecodeHook: mapstructure.ComposeDecodeHookFunc(
expandNilStructPointersHookFunc(),

View File

@ -13,7 +13,7 @@ import (
"go.opentelemetry.io/collector/confmap"
"go.opentelemetry.io/collector/confmap/internal/envvar"
"go.opentelemetry.io/collector/internal/featuregates"
"go.opentelemetry.io/collector/internal/globalgates"
)
type converter struct {
@ -93,7 +93,7 @@ func (c converter) expandEnv(s string) (string, error) {
// in order to make sure we don't log a warning for ${VAR}
var regex = regexp.MustCompile(fmt.Sprintf(`\$%s`, regexp.QuoteMeta(str)))
if _, exists := c.loggedDeprecations[str]; !exists && regex.MatchString(s) {
if featuregates.UseUnifiedEnvVarExpansionRules.IsEnabled() {
if globalgates.UseUnifiedEnvVarExpansionRules.IsEnabled() {
err = fmt.Errorf("variable substitution using $VAR has been deprecated in favor of ${VAR} and ${env:VAR} - please update $%s or temporarily disable the confmap.unifyEnvVarExpansion feature gate", str)
return ""
}

View File

@ -19,7 +19,7 @@ import (
"go.opentelemetry.io/collector/confmap/confmaptest"
"go.opentelemetry.io/collector/confmap/internal/envvar"
"go.opentelemetry.io/collector/featuregate"
"go.opentelemetry.io/collector/internal/featuregates"
"go.opentelemetry.io/collector/internal/globalgates"
)
func TestNewExpandConverter(t *testing.T) {
@ -48,9 +48,9 @@ func TestNewExpandConverter(t *testing.T) {
for _, test := range testCases {
t.Run(test.name, func(t *testing.T) {
require.NoError(t, featuregate.GlobalRegistry().Set(featuregates.UseUnifiedEnvVarExpansionRules.ID(), false))
require.NoError(t, featuregate.GlobalRegistry().Set(globalgates.UseUnifiedEnvVarExpansionRules.ID(), false))
t.Cleanup(func() {
require.NoError(t, featuregate.GlobalRegistry().Set(featuregates.UseUnifiedEnvVarExpansionRules.ID(), true))
require.NoError(t, featuregate.GlobalRegistry().Set(globalgates.UseUnifiedEnvVarExpansionRules.ID(), true))
})
conf, err := confmaptest.LoadConf(filepath.Join("testdata", test.name))
@ -64,9 +64,9 @@ func TestNewExpandConverter(t *testing.T) {
}
func TestNewExpandConverter_UseUnifiedEnvVarExpansionRules(t *testing.T) {
require.NoError(t, featuregate.GlobalRegistry().Set(featuregates.UseUnifiedEnvVarExpansionRules.ID(), true))
require.NoError(t, featuregate.GlobalRegistry().Set(globalgates.UseUnifiedEnvVarExpansionRules.ID(), true))
t.Cleanup(func() {
require.NoError(t, featuregate.GlobalRegistry().Set(featuregates.UseUnifiedEnvVarExpansionRules.ID(), false))
require.NoError(t, featuregate.GlobalRegistry().Set(globalgates.UseUnifiedEnvVarExpansionRules.ID(), false))
})
const valueExtra = "some string"

View File

@ -6,7 +6,7 @@ require (
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/confmap v0.104.0
go.opentelemetry.io/collector/featuregate v1.11.0
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
)
@ -29,4 +29,4 @@ replace go.opentelemetry.io/collector/confmap => ../..
replace go.opentelemetry.io/collector/featuregate => ../../../featuregate
replace go.opentelemetry.io/collector/internal/featuregates => ../../../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../../../internal/globalgates

View File

@ -12,7 +12,7 @@ import (
"strconv"
"strings"
"go.opentelemetry.io/collector/internal/featuregates"
"go.opentelemetry.io/collector/internal/globalgates"
)
// schemePattern defines the regexp pattern for scheme names.
@ -146,7 +146,7 @@ func (mr *Resolver) findAndExpandURI(ctx context.Context, input string) (any, bo
}
var repl string
if featuregates.StrictlyTypedInputGate.IsEnabled() {
if globalgates.StrictlyTypedInputGate.IsEnabled() {
repl, err = expanded.AsString()
} else {
repl, err = toString(expanded)

View File

@ -8,7 +8,7 @@ require (
github.com/knadh/koanf/providers/confmap v0.1.0
github.com/knadh/koanf/v2 v2.1.1
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038
go.uber.org/goleak v1.3.0
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.27.0
@ -31,4 +31,4 @@ retract (
replace go.opentelemetry.io/collector/featuregate => ../featuregate
replace go.opentelemetry.io/collector/internal/featuregates => ../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../internal/globalgates

View File

@ -8,7 +8,7 @@ require (
go.opentelemetry.io/collector/confmap/provider/envprovider v0.104.0
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.0
go.opentelemetry.io/collector/featuregate v1.11.0
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038
)
require (
@ -34,4 +34,4 @@ replace go.opentelemetry.io/collector/confmap/provider/envprovider => ../../prov
replace go.opentelemetry.io/collector/featuregate => ../../../featuregate
replace go.opentelemetry.io/collector/internal/featuregates => ../../../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../../../internal/globalgates

View File

@ -14,7 +14,7 @@ import (
"go.opentelemetry.io/collector/confmap/provider/envprovider"
"go.opentelemetry.io/collector/confmap/provider/fileprovider"
"go.opentelemetry.io/collector/featuregate"
"go.opentelemetry.io/collector/internal/featuregates"
"go.opentelemetry.io/collector/internal/globalgates"
)
type TargetField string
@ -172,11 +172,11 @@ func TestTypeCasting(t *testing.T) {
},
}
previousValue := featuregates.StrictlyTypedInputGate.IsEnabled()
err := featuregate.GlobalRegistry().Set(featuregates.StrictlyTypedInputID, false)
previousValue := globalgates.StrictlyTypedInputGate.IsEnabled()
err := featuregate.GlobalRegistry().Set(globalgates.StrictlyTypedInputID, false)
require.NoError(t, err)
defer func() {
err := featuregate.GlobalRegistry().Set(featuregates.StrictlyTypedInputID, previousValue)
err := featuregate.GlobalRegistry().Set(globalgates.StrictlyTypedInputID, previousValue)
require.NoError(t, err)
}()
@ -317,11 +317,11 @@ func TestStrictTypeCasting(t *testing.T) {
},
}
previousValue := featuregates.StrictlyTypedInputGate.IsEnabled()
err := featuregate.GlobalRegistry().Set(featuregates.StrictlyTypedInputID, true)
previousValue := globalgates.StrictlyTypedInputGate.IsEnabled()
err := featuregate.GlobalRegistry().Set(globalgates.StrictlyTypedInputID, true)
require.NoError(t, err)
defer func() {
err := featuregate.GlobalRegistry().Set(featuregates.StrictlyTypedInputID, previousValue)
err := featuregate.GlobalRegistry().Set(globalgates.StrictlyTypedInputID, previousValue)
require.NoError(t, err)
}()

View File

@ -20,7 +20,7 @@ require (
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
go.uber.org/multierr v1.11.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
@ -29,4 +29,4 @@ replace go.opentelemetry.io/collector/confmap => ../../
replace go.opentelemetry.io/collector/featuregate => ../../../featuregate
replace go.opentelemetry.io/collector/internal/featuregates => ../../../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../../../internal/globalgates

View File

@ -19,7 +19,7 @@ require (
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
@ -29,4 +29,4 @@ replace go.opentelemetry.io/collector/confmap => ../../
replace go.opentelemetry.io/collector/featuregate => ../../../featuregate
replace go.opentelemetry.io/collector/internal/featuregates => ../../../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../../../internal/globalgates

View File

@ -19,7 +19,7 @@ require (
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
@ -29,4 +29,4 @@ replace go.opentelemetry.io/collector/confmap => ../../
replace go.opentelemetry.io/collector/featuregate => ../../../featuregate
replace go.opentelemetry.io/collector/internal/featuregates => ../../../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../../../internal/globalgates

View File

@ -19,7 +19,7 @@ require (
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
@ -29,4 +29,4 @@ replace go.opentelemetry.io/collector/confmap => ../../
replace go.opentelemetry.io/collector/featuregate => ../../../featuregate
replace go.opentelemetry.io/collector/internal/featuregates => ../../../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../../../internal/globalgates

View File

@ -19,7 +19,7 @@ require (
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
@ -29,4 +29,4 @@ replace go.opentelemetry.io/collector/confmap => ../../
replace go.opentelemetry.io/collector/featuregate => ../../../featuregate
replace go.opentelemetry.io/collector/internal/featuregates => ../../../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../../../internal/globalgates

View File

@ -13,7 +13,7 @@ import (
"go.uber.org/multierr"
"go.uber.org/zap"
"go.opentelemetry.io/collector/internal/featuregates"
"go.opentelemetry.io/collector/internal/globalgates"
)
// follows drive-letter specification:
@ -174,7 +174,7 @@ func (mr *Resolver) Resolve(ctx context.Context) (*Conf, error) {
return nil, err
}
if v, ok := val.(string); ok && featuregates.UseUnifiedEnvVarExpansionRules.IsEnabled() {
if v, ok := val.(string); ok && globalgates.UseUnifiedEnvVarExpansionRules.IsEnabled() {
cfgMap[k] = strings.ReplaceAll(v, "$$", "$")
} else {
cfgMap[k] = val

View File

@ -39,7 +39,7 @@ require (
go.opentelemetry.io/collector v0.104.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect
@ -59,7 +59,7 @@ require (
replace go.opentelemetry.io/collector => ../../
replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
replace go.opentelemetry.io/collector/component => ../../component

View File

@ -66,4 +66,4 @@ replace go.opentelemetry.io/collector/pdata/testdata => ../pdata/testdata
replace go.opentelemetry.io/collector/pdata/pprofile => ../pdata/pprofile
replace go.opentelemetry.io/collector/internal/featuregates => ../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../internal/globalgates

View File

@ -44,7 +44,7 @@ require (
go.opentelemetry.io/collector/config/configretry v1.11.0 // indirect
go.opentelemetry.io/collector/extension v0.104.0 // indirect
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect
go.opentelemetry.io/collector/receiver v0.104.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
@ -65,7 +65,7 @@ require (
replace go.opentelemetry.io/collector => ../../
replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
replace go.opentelemetry.io/collector/component => ../../component

View File

@ -52,7 +52,7 @@ require (
github.com/prometheus/procfs v0.15.1 // indirect
go.opentelemetry.io/collector/confmap v0.104.0 // indirect
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
golang.org/x/net v0.26.0 // indirect
@ -64,7 +64,7 @@ require (
replace go.opentelemetry.io/collector => ../
replace go.opentelemetry.io/collector/internal/featuregates => ../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../internal/globalgates
replace go.opentelemetry.io/collector/component => ../component

View File

@ -44,7 +44,7 @@ require (
go.opentelemetry.io/collector/consumer v0.104.0 // indirect
go.opentelemetry.io/collector/extension v0.104.0 // indirect
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/receiver v0.104.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
@ -64,7 +64,7 @@ require (
replace go.opentelemetry.io/collector => ../../
replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
replace go.opentelemetry.io/collector/component => ../../component

View File

@ -38,7 +38,7 @@ require (
github.com/prometheus/procfs v0.15.1 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/receiver v0.104.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
@ -73,7 +73,7 @@ replace go.opentelemetry.io/collector/receiver => ../../receiver
replace go.opentelemetry.io/collector => ../..
replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
replace go.opentelemetry.io/collector/featuregate => ../../featuregate

View File

@ -60,7 +60,7 @@ require (
go.opentelemetry.io/collector/extension v0.104.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect
go.opentelemetry.io/collector/receiver v0.104.0 // indirect
go.opentelemetry.io/contrib/config v0.8.0 // indirect
@ -137,4 +137,4 @@ replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/con
replace go.opentelemetry.io/collector/config/configretry => ../../config/configretry
replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates

View File

@ -59,7 +59,7 @@ require (
go.opentelemetry.io/collector/extension v0.104.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/receiver v0.104.0 // indirect
go.opentelemetry.io/contrib/config v0.8.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
@ -133,4 +133,4 @@ retract (
replace go.opentelemetry.io/collector/config/configretry => ../../config/configretry
replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates

View File

@ -34,7 +34,7 @@ require (
go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect
go.opentelemetry.io/collector/confmap v0.104.0 // indirect
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/pdata v1.11.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
@ -64,4 +64,4 @@ replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/con
replace go.opentelemetry.io/collector/featuregate => ../../featuregate
replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates

View File

@ -43,7 +43,7 @@ require (
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/pdata v1.11.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
@ -63,7 +63,7 @@ require (
replace go.opentelemetry.io/collector => ../../
replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
replace go.opentelemetry.io/collector/component => ../../component

View File

@ -32,7 +32,7 @@ require (
github.com/prometheus/procfs v0.15.1 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/pdata v1.11.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
@ -61,4 +61,4 @@ replace go.opentelemetry.io/collector/config/configtelemetry => ../config/config
replace go.opentelemetry.io/collector/featuregate => ../featuregate
replace go.opentelemetry.io/collector/internal/featuregates => ../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../internal/globalgates

View File

@ -42,7 +42,7 @@ require (
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/pdata v1.11.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
@ -62,7 +62,7 @@ require (
replace go.opentelemetry.io/collector => ../../
replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
replace go.opentelemetry.io/collector/component => ../../component

View File

@ -52,7 +52,7 @@ require (
go.opentelemetry.io/collector/config/internal v0.104.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/pdata v1.11.0 // indirect
go.opentelemetry.io/contrib/config v0.8.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
@ -121,4 +121,4 @@ replace go.opentelemetry.io/collector/config/confighttp => ../../config/confight
replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile
replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates

View File

@ -18,7 +18,7 @@ require (
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
@ -28,4 +28,4 @@ replace go.opentelemetry.io/collector/confmap => ../confmap
replace go.opentelemetry.io/collector/featuregate => ../featuregate
replace go.opentelemetry.io/collector/internal/featuregates => ../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../internal/globalgates

4
go.mod
View File

@ -59,7 +59,7 @@ require (
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect
@ -111,4 +111,4 @@ retract (
replace go.opentelemetry.io/collector/pdata/pprofile => ./pdata/pprofile
replace go.opentelemetry.io/collector/internal/featuregates => ./internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ./internal/globalgates

View File

@ -63,7 +63,7 @@ require (
go.opentelemetry.io/collector/extension v0.104.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect
go.opentelemetry.io/contrib/config v0.8.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
@ -147,4 +147,4 @@ replace go.opentelemetry.io/collector/featuregate => ../../featuregate
replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry
replace go.opentelemetry.io/collector/internal/featuregates => ../featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../globalgates

View File

@ -1,7 +1,7 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0
package featuregates // import "go.opentelemetry.io/collector/internal/featuregates"
package globalgates // import "go.opentelemetry.io/collector/internal/globalgates"
import "go.opentelemetry.io/collector/featuregate"

View File

@ -1,4 +1,4 @@
module go.opentelemetry.io/collector/internal/featuregates
module go.opentelemetry.io/collector/internal/globalgates
go 1.21.0

View File

@ -10,7 +10,7 @@ import (
"github.com/spf13/cobra"
"go.opentelemetry.io/collector/featuregate"
"go.opentelemetry.io/collector/internal/featuregates"
"go.opentelemetry.io/collector/internal/globalgates"
)
// NewCommand constructs a new cobra.Command using the given CollectorSettings.
@ -66,7 +66,7 @@ func updateSettingsUsingFlags(set *CollectorSettings, flags *flag.FlagSet) error
return errors.New("at least one config flag must be provided")
}
if featuregates.UseUnifiedEnvVarExpansionRules.IsEnabled() && set.ConfigProviderSettings.ResolverSettings.DefaultScheme == "" {
if globalgates.UseUnifiedEnvVarExpansionRules.IsEnabled() && set.ConfigProviderSettings.ResolverSettings.DefaultScheme == "" {
set.ConfigProviderSettings.ResolverSettings.DefaultScheme = "env"
}

View File

@ -15,7 +15,7 @@ import (
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/confmap"
"go.opentelemetry.io/collector/featuregate"
"go.opentelemetry.io/collector/internal/featuregates"
"go.opentelemetry.io/collector/internal/globalgates"
)
func TestNewCommandVersion(t *testing.T) {
@ -139,9 +139,9 @@ func Test_UseUnifiedEnvVarExpansionRules(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
require.NoError(t, featuregate.GlobalRegistry().Set(featuregates.UseUnifiedEnvVarExpansionRules.ID(), true))
require.NoError(t, featuregate.GlobalRegistry().Set(globalgates.UseUnifiedEnvVarExpansionRules.ID(), true))
t.Cleanup(func() {
require.NoError(t, featuregate.GlobalRegistry().Set(featuregates.UseUnifiedEnvVarExpansionRules.ID(), false))
require.NoError(t, featuregate.GlobalRegistry().Set(globalgates.UseUnifiedEnvVarExpansionRules.ID(), false))
})
fileProvider := newFakeProvider("file", func(_ context.Context, _ string, _ confmap.WatcherFunc) (*confmap.Retrieved, error) {
return &confmap.Retrieved{}, nil

View File

@ -9,12 +9,12 @@ import (
"strings"
"go.opentelemetry.io/collector/confmap"
"go.opentelemetry.io/collector/internal/featuregates"
"go.opentelemetry.io/collector/internal/globalgates"
)
var (
strictlyTypedMessageCoda = `Hint: Temporarily restore the previous behavior by disabling
the ` + fmt.Sprintf("`%s`", featuregates.StrictlyTypedInputID) + ` feature gate. More details at:
the ` + fmt.Sprintf("`%s`", globalgates.StrictlyTypedInputID) + ` feature gate. More details at:
https://github.com/open-telemetry/opentelemetry-collector/issues/10552`
)
@ -107,7 +107,7 @@ func (cm *configProvider) Get(ctx context.Context, factories Factories) (*Config
if cfg, err = unmarshal(conf, factories); err != nil {
err = fmt.Errorf("cannot unmarshal the configuration: %w", err)
if featuregates.StrictlyTypedInputGate.IsEnabled() {
if globalgates.StrictlyTypedInputGate.IsEnabled() {
var shouldAddCoda bool
for _, errorStr := range []string{
"got unconvertible type", // https://github.com/mitchellh/mapstructure/blob/8508981/mapstructure.go#L610

View File

@ -15,7 +15,7 @@ import (
"go.opentelemetry.io/collector/confmap"
"go.opentelemetry.io/collector/featuregate"
"go.opentelemetry.io/collector/internal/featuregates"
"go.opentelemetry.io/collector/internal/globalgates"
)
func newConfig(yamlBytes []byte, factories Factories) (*Config, error) {
@ -181,13 +181,13 @@ func TestStrictlyTypedCoda(t *testing.T) {
require.NoError(t, err)
// Save the previous value of the feature gate and restore it after the test.
prev := featuregates.StrictlyTypedInputGate.IsEnabled()
prev := globalgates.StrictlyTypedInputGate.IsEnabled()
defer func() {
require.NoError(t, featuregate.GlobalRegistry().Set(featuregates.StrictlyTypedInputID, prev))
require.NoError(t, featuregate.GlobalRegistry().Set(globalgates.StrictlyTypedInputID, prev))
}()
// Ensure the error does not appear with the feature gate disabled.
require.NoError(t, featuregate.GlobalRegistry().Set(featuregates.StrictlyTypedInputID, false))
require.NoError(t, featuregate.GlobalRegistry().Set(globalgates.StrictlyTypedInputID, false))
_, errWeakTypes := cp.Get(context.Background(), factories)
if tt.isErrFromStrictTypes {
require.Error(t, errWeakTypes)
@ -198,7 +198,7 @@ func TestStrictlyTypedCoda(t *testing.T) {
}
// Test with the feature gate enabled.
require.NoError(t, featuregate.GlobalRegistry().Set(featuregates.StrictlyTypedInputID, true))
require.NoError(t, featuregate.GlobalRegistry().Set(globalgates.StrictlyTypedInputID, true))
_, errStrictTypes := cp.Get(context.Background(), factories)
require.Error(t, errStrictTypes)
if tt.isErrFromStrictTypes {

View File

@ -12,7 +12,7 @@ require (
go.opentelemetry.io/collector/exporter v0.104.0
go.opentelemetry.io/collector/extension v0.104.0
go.opentelemetry.io/collector/featuregate v1.11.0
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038
go.opentelemetry.io/collector/processor v0.104.0
go.opentelemetry.io/collector/receiver v0.104.0
go.opentelemetry.io/collector/service v0.104.0
@ -147,4 +147,4 @@ replace go.opentelemetry.io/collector/config/configtls => ../config/configtls
replace go.opentelemetry.io/collector/config/configopaque => ../config/configopaque
replace go.opentelemetry.io/collector/internal/featuregates => ../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../internal/globalgates

View File

@ -64,7 +64,7 @@ require (
go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect
go.opentelemetry.io/collector/consumer v0.104.0 // indirect
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/pdata v1.11.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect
go.opentelemetry.io/collector/pdata/testdata v0.104.0 // indirect
@ -165,4 +165,4 @@ replace go.opentelemetry.io/collector/semconv => ../../semconv
replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth
replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates

View File

@ -45,7 +45,7 @@ require (
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
@ -61,7 +61,7 @@ require (
replace go.opentelemetry.io/collector => ../../
replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
replace go.opentelemetry.io/collector/processor => ../

View File

@ -66,4 +66,4 @@ replace go.opentelemetry.io/collector/pdata/pprofile => ../pdata/pprofile
replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry
replace go.opentelemetry.io/collector/internal/featuregates => ../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../internal/globalgates

View File

@ -46,7 +46,7 @@ require (
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect
go.opentelemetry.io/collector/pdata/testdata v0.104.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
@ -68,7 +68,7 @@ require (
replace go.opentelemetry.io/collector => ../../
replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
replace go.opentelemetry.io/collector/processor => ../

View File

@ -66,4 +66,4 @@ replace go.opentelemetry.io/collector/config/configtelemetry => ../config/config
replace go.opentelemetry.io/collector/pdata/pprofile => ../pdata/pprofile
replace go.opentelemetry.io/collector/internal/featuregates => ../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../internal/globalgates

View File

@ -37,7 +37,7 @@ require (
github.com/prometheus/procfs v0.15.1 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/pdata v1.11.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
@ -72,7 +72,7 @@ replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/con
replace go.opentelemetry.io/collector => ../..
replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
replace go.opentelemetry.io/collector/featuregate => ../../featuregate

View File

@ -62,7 +62,7 @@ require (
go.opentelemetry.io/collector/extension v0.104.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect
go.opentelemetry.io/contrib/config v0.8.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
@ -137,4 +137,4 @@ retract (
replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile
replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates

View File

@ -21,7 +21,7 @@ require (
go.opentelemetry.io/collector/extension v0.104.0
go.opentelemetry.io/collector/extension/zpagesextension v0.104.0
go.opentelemetry.io/collector/featuregate v1.11.0
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038
go.opentelemetry.io/collector/pdata v1.11.0
go.opentelemetry.io/collector/pdata/testdata v0.104.0
go.opentelemetry.io/collector/processor v0.104.0
@ -155,4 +155,4 @@ replace go.opentelemetry.io/collector/config/configcompression => ../config/conf
replace go.opentelemetry.io/collector/pdata/pprofile => ../pdata/pprofile
replace go.opentelemetry.io/collector/internal/featuregates => ../internal/featuregates
replace go.opentelemetry.io/collector/internal/globalgates => ../internal/globalgates

View File

@ -28,7 +28,7 @@ import (
sdkmetric "go.opentelemetry.io/otel/sdk/metric"
"go.opentelemetry.io/otel/sdk/resource"
"go.opentelemetry.io/collector/internal/featuregates"
"go.opentelemetry.io/collector/internal/globalgates"
"go.opentelemetry.io/collector/processor/processorhelper"
semconv "go.opentelemetry.io/collector/semconv/v1.18.0"
)
@ -70,7 +70,7 @@ func InitMetricReader(ctx context.Context, reader config.MetricReader, asyncErro
if reader.Periodic != nil {
var opts []sdkmetric.PeriodicReaderOption
if !featuregates.DisableOpenCensusBridge.IsEnabled() {
if !globalgates.DisableOpenCensusBridge.IsEnabled() {
opts = append(opts, sdkmetric.WithProducer(opencensus.NewMetricProducer()))
}
if reader.Periodic.Interval != nil {
@ -175,7 +175,7 @@ func initPrometheusExporter(prometheusConfig *config.Prometheus, asyncErrorChann
otelprom.WithNamespace("otelcol"),
otelprom.WithResourceAsConstantLabels(attribute.NewDenyKeysFilter()),
}
if !featuregates.DisableOpenCensusBridge.IsEnabled() {
if !globalgates.DisableOpenCensusBridge.IsEnabled() {
opts = append(opts, otelprom.WithProducer(opencensus.NewMetricProducer()))
}
exporter, err := otelprom.New(opts...)

View File

@ -22,7 +22,7 @@ import (
"go.opentelemetry.io/collector/connector"
"go.opentelemetry.io/collector/exporter"
"go.opentelemetry.io/collector/extension"
"go.opentelemetry.io/collector/internal/featuregates"
"go.opentelemetry.io/collector/internal/globalgates"
"go.opentelemetry.io/collector/internal/localhostgate"
"go.opentelemetry.io/collector/internal/obsreportconfig"
"go.opentelemetry.io/collector/pdata/pcommon"
@ -115,7 +115,7 @@ func New(ctx context.Context, set Settings, cfg Config) (*Service, error) {
logger.Info("Setting up own telemetry...")
if featuregates.DisableOpenCensusBridge.IsEnabled() {
if globalgates.DisableOpenCensusBridge.IsEnabled() {
logger.Info("OpenCensus bridge is disabled for Collector telemetry and will be removed in a future version, use --feature-gates=-service.disableOpenCensusBridge to re-enable")
}
mp, err := newMeterProvider(

View File

@ -20,7 +20,7 @@ import (
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config/configtelemetry"
"go.opentelemetry.io/collector/featuregate"
"go.opentelemetry.io/collector/internal/featuregates"
"go.opentelemetry.io/collector/internal/globalgates"
"go.opentelemetry.io/collector/internal/testutil"
semconv "go.opentelemetry.io/collector/semconv/v1.18.0"
"go.opentelemetry.io/collector/service/internal/proctelemetry"
@ -262,9 +262,9 @@ func TestTelemetryInit(t *testing.T) {
},
} {
t.Run(tc.name, func(t *testing.T) {
require.NoError(t, featuregate.GlobalRegistry().Set(featuregates.DisableOpenCensusBridge.ID(), tc.disableCensusBridge))
require.NoError(t, featuregate.GlobalRegistry().Set(globalgates.DisableOpenCensusBridge.ID(), tc.disableCensusBridge))
t.Cleanup(func() {
require.NoError(t, featuregate.GlobalRegistry().Set(featuregates.DisableOpenCensusBridge.ID(), true))
require.NoError(t, featuregate.GlobalRegistry().Set(globalgates.DisableOpenCensusBridge.ID(), true))
})
if tc.extendedConfig {
tc.cfg.Metrics.Readers = []config.MetricReader{

View File

@ -15,7 +15,7 @@ module-sets:
version: v0.104.0
modules:
- go.opentelemetry.io/collector
- go.opentelemetry.io/collector/internal/featuregates
- go.opentelemetry.io/collector/internal/globalgates
- go.opentelemetry.io/collector/cmd/builder
- go.opentelemetry.io/collector/cmd/mdatagen
- go.opentelemetry.io/collector/component