forked from open-telemetry/opentelemetry-collector
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Revert "Support set flag for component configs (open-telemetr…
…y#1640)" (open-telemetry#1905)" This reverts commit 2efdb28.
- Loading branch information
1 parent
3e3b201
commit c13553a
Showing
6 changed files
with
270 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| // Copyright The OpenTelemetry Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package service | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "fmt" | ||
| "strings" | ||
|
|
||
| "github.com/spf13/cobra" | ||
| "github.com/spf13/pflag" | ||
| "github.com/spf13/viper" | ||
|
|
||
| "go.opentelemetry.io/collector/config" | ||
| ) | ||
|
|
||
| const ( | ||
| setFlagName = "set" | ||
| setFlagFileType = "properties" | ||
| ) | ||
|
|
||
| func addSetFlag(flagSet *pflag.FlagSet) { | ||
| flagSet.StringArray(setFlagName, []string{}, "Set arbitrary component config property. The component has to be defined in the config file and the flag has a higher precedence. Array config properties are overridden and maps are joined, note that only a single (first) array property can be set e.g. -set=processors.attributes.actions.key=some_key. Example --set=processors.batch.timeout=2s") | ||
| } | ||
|
|
||
| // AddSetFlagProperties overrides properties from set flag(s) in supplied viper instance. | ||
| // The implementation reads set flag(s) from the cmd and passes the content to a new viper instance as .properties file. | ||
| // Then the properties from new viper instance are read and set to the supplied viper. | ||
| func AddSetFlagProperties(v *viper.Viper, cmd *cobra.Command) error { | ||
| flagProperties, err := cmd.Flags().GetStringArray(setFlagName) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if len(flagProperties) == 0 { | ||
| return nil | ||
| } | ||
| b := &bytes.Buffer{} | ||
| for _, property := range flagProperties { | ||
| property = strings.TrimSpace(property) | ||
| if _, err := fmt.Fprintf(b, "%s\n", property); err != nil { | ||
| return err | ||
| } | ||
| } | ||
| viperFlags := config.NewViper() | ||
| viperFlags.SetConfigType(setFlagFileType) | ||
| if err := viperFlags.ReadConfig(b); err != nil { | ||
| return fmt.Errorf("failed to read set flag config: %v", err) | ||
| } | ||
|
|
||
| // flagProperties cannot be applied to v directly because | ||
| // v.MergeConfig(io.Reader) or v.MergeConfigMap(map[string]interface) does not work properly. | ||
| for _, k := range viperFlags.AllKeys() { | ||
| v.Set(k, viperFlags.Get(k)) | ||
| } | ||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| // Copyright The OpenTelemetry Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package service | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/spf13/cobra" | ||
| "github.com/spf13/viper" | ||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func TestSetFlags(t *testing.T) { | ||
| cmd := &cobra.Command{} | ||
| addSetFlag(cmd.Flags()) | ||
|
|
||
| err := cmd.ParseFlags([]string{ | ||
| "--set=processors.batch.timeout=2s", | ||
| "--set=processors.batch/foo.timeout=3s", | ||
| "--set=receivers.otlp.protocols.grpc.endpoint=localhost:1818", | ||
| "--set=exporters.kafka.brokers=foo:9200,foo2:9200", | ||
| }) | ||
| require.NoError(t, err) | ||
|
|
||
| v := viper.New() | ||
| err = AddSetFlagProperties(v, cmd) | ||
| require.NoError(t, err) | ||
|
|
||
| settings := v.AllSettings() | ||
| assert.Equal(t, 4, len(settings)) | ||
| assert.Equal(t, "2s", v.Get("processors::batch::timeout")) | ||
| assert.Equal(t, "3s", v.Get("processors::batch/foo::timeout")) | ||
| assert.Equal(t, "foo:9200,foo2:9200", v.Get("exporters::kafka::brokers")) | ||
| assert.Equal(t, "localhost:1818", v.Get("receivers::otlp::protocols::grpc::endpoint")) | ||
| } | ||
|
|
||
| func TestSetFlags_err_set_flag(t *testing.T) { | ||
| cmd := &cobra.Command{} | ||
| v := viper.New() | ||
| err := AddSetFlagProperties(v, cmd) | ||
| require.Error(t, err) | ||
| } | ||
|
|
||
| func TestSetFlags_empty(t *testing.T) { | ||
| cmd := &cobra.Command{} | ||
| addSetFlag(cmd.Flags()) | ||
| v := viper.New() | ||
| err := AddSetFlagProperties(v, cmd) | ||
| require.NoError(t, err) | ||
| assert.Equal(t, 0, len(v.AllSettings())) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters