-
Notifications
You must be signed in to change notification settings - Fork 158
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
update otelcol deps to 0.67.0 #2358
Merged
Merged
Conversation
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
jvoravong
reviewed
Dec 13, 2022
rmfitzpatrick
force-pushed
the
update0670deps
branch
6 times, most recently
from
December 15, 2022 15:24
869b591
to
68da021
Compare
rmfitzpatrick
changed the title
DRAFT: update otelcol deps to 0.67.0
update otelcol deps to 0.67.0
Dec 15, 2022
@rmfitzpatrick please rebase? |
open-telemetry/opentelemetry-collector#6656 removed the overwrite properties config converter that this distribution uses.
rmfitzpatrick
force-pushed
the
update0670deps
branch
from
December 15, 2022 17:36
68da021
to
2683718
Compare
hughesjj
approved these changes
Dec 15, 2022
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
// Taken from https://github.com/open-telemetry/opentelemetry-collector/blob/v0.66.0/confmap/converter/overwritepropertiesconverter/properties.go |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good find, nice reuse
dmitryax
reviewed
Dec 15, 2022
@@ -182,6 +179,7 @@ func parseArgs(args []string) (*Settings, error) { | |||
"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. Example --set=processors.batch.timeout=2s") | |||
flagSet.BoolVar(&settings.dryRun, "dry-run", false, "Don't run the service, just show the configuration") | |||
flagSet.MarkHidden("dry-run") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why don't we want to show dry-run
in the usage? Is this experimental and can be removed?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
These changes update the collector deps to 0.67.0 and migrate the obsoleted overwrite properties converter to our converters to prevent potential breaking changes (with added* integration test).