config: add support for configuring propagators #6727
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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
|
pellared marked this conversation as resolved.
|
This file contains hidden or 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 hidden or 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,41 @@ | ||
| // Copyright The OpenTelemetry Authors | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package config // import "go.opentelemetry.io/contrib/config/v0.3.0" | ||
|
|
||
| import ( | ||
| "errors" | ||
|
|
||
| "go.opentelemetry.io/contrib/propagators/autoprop" | ||
| "go.opentelemetry.io/otel/propagation" | ||
| ) | ||
|
|
||
| var ( | ||
| errInvalidPropagatorEmpty = errors.New("invalid propagator name: empty") | ||
| errInvalidPropagatorNil = errors.New("invalid propagator name: nil") | ||
| ) | ||
|
|
||
| func propagator(cfg configOptions) (propagation.TextMapPropagator, error) { | ||
| if cfg.opentelemetryConfig.Propagator == nil { | ||
| return autoprop.NewTextMapPropagator(), nil | ||
| } | ||
|
|
||
| n := len(cfg.opentelemetryConfig.Propagator.Composite) | ||
| if n == 0 { | ||
| return autoprop.NewTextMapPropagator(), nil | ||
| } | ||
|
Comment on lines
+23
to
+26
Member
There was a problem hiding this comment. There is a difference between "propagator": {
}, and "propagator": {
"composite": []
}, From the specification:
The first one should return the default value. The second an empty composite propagator. if cfg.opentelemetryConfig.Propagator.Composite == nil {
return propagation.NewCompositeTextMapPropagator()
}
n := len(cfg.opentelemetryConfig.Propagator.Composite)
if n == 0 {
return autoprop.NewTextMapPropagator(), nil
} |
||
|
|
||
| names := make([]string, 0, n) | ||
| for _, name := range cfg.opentelemetryConfig.Propagator.Composite { | ||
| if name == nil { | ||
| return nil, errInvalidPropagatorNil | ||
| } | ||
| if *name == "" { | ||
| return nil, errInvalidPropagatorEmpty | ||
| } | ||
|
Comment on lines
+33
to
+35
Member
There was a problem hiding this comment. I do not see anything in the schema that disallows using empty name. See: https://github.com/open-telemetry/opentelemetry-configuration/blob/main/schema/propagator.json
Sorry that I was not precise in #6727 (comment) 🙇
Contributor
There was a problem hiding this comment. i opened an issue in the configuration repo to discuss this, i submitted a PR to propose enforcing a minimum length on propagator configuration |
||
|
|
||
| names = append(names, *name) | ||
| } | ||
|
|
||
| return autoprop.TextMapPropagator(names...) | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.