Skip to content
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 3 commits into from
Dec 15, 2022
Merged

update otelcol deps to 0.67.0 #2358

merged 3 commits into from
Dec 15, 2022

Conversation

rmfitzpatrick
Copy link
Contributor

@rmfitzpatrick rmfitzpatrick commented Dec 12, 2022

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).

@rmfitzpatrick rmfitzpatrick requested review from a team as code owners December 12, 2022 22:14
@rmfitzpatrick rmfitzpatrick marked this pull request as draft December 12, 2022 22:14
@rmfitzpatrick rmfitzpatrick force-pushed the update0670deps branch 6 times, most recently from 869b591 to 68da021 Compare December 15, 2022 15:24
@rmfitzpatrick rmfitzpatrick changed the title DRAFT: update otelcol deps to 0.67.0 update otelcol deps to 0.67.0 Dec 15, 2022
@rmfitzpatrick rmfitzpatrick marked this pull request as ready for review December 15, 2022 16:10
@atoulme
Copy link
Contributor

atoulme commented Dec 15, 2022

@rmfitzpatrick please rebase?

// 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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good find, nice reuse

@hughesjj hughesjj merged commit e7064dc into main Dec 15, 2022
@delete-merged-branch delete-merged-branch bot deleted the update0670deps branch December 15, 2022 19:28
@@ -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")
Copy link
Contributor

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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants