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.

Sign up for GitHub

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

Jump to bottom

Standarize Settings, Params and Parameters #3163

Merged
merged 7 commits into from
May 21, 2021
Merged

Standarize Settings, Params and Parameters #3163

merged 7 commits into from
May 21, 2021

Conversation

pmatyjasek-sumo
Copy link
Contributor

Description:
Continuation work from #2991
Fixes #2650
Replace Parameters and settings structs with new struct Settings
Replace dependencies in service and main
Update tests

Signed-off-by: Patryk Matyjasek pmatyjasek@sumologic.com

Link to tracking Issue:
#2650

Testing:
Update unit tests

Documentation:
In code comments

@pmatyjasek-sumo pmatyjasek-sumo requested a review from a team May 13, 2021 10:00
@pmatyjasek-sumo
Copy link
Contributor Author

@bogdandrutu this is a first PR with Service part changes

bogdandrutu
bogdandrutu reviewed May 13, 2021
View reviewed changes
service/internal/zpages/tmplgen/resources.go Outdated Show resolved Hide resolved
service/service.go Outdated Show resolved Hide resolved
@bogdandrutu
Copy link
Member

adding waiting for author label since @pmatyjasek-sumo has to revert one change

@pmatyjasek-sumo
Copy link
Contributor Author

@bogdandrutu please check if it is ok now

bogdandrutu
bogdandrutu reviewed May 19, 2021
View reviewed changes
component/component.go Outdated Show resolved Hide resolved
service/settings.go Outdated Show resolved Hide resolved
service/settings.go Outdated Show resolved Hide resolved
bogdandrutu
bogdandrutu approved these changes May 20, 2021
View reviewed changes
Copy link
Member

@bogdandrutu bogdandrutu left a comment

Choose a reason for hiding this comment

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

LGTM except the unused Settings in the component.

@bogdandrutu
Copy link
Member 

# go.opentelemetry.io/collector/service [go.opentelemetry.io/collector/service.test]
service\application_windows_test.go:37:36: cannot use svcSettings{...} (type svcSettings) as type AppSettings in argument to NewWindowsService

@pmatyjasek-sumo
Standarize Settings, Params and Parameters
c352f02 
Replace Parameters and settings structs with new struct Settings
Replace dependencies in service and main
Update tests

Signed-off-by: Patryk Matyjasek <pmatyjasek@sumologic.com>

# Conflicts:
#	service/application_windows.go
@pmatyjasek-sumo
Fix unnecessary file
5ee40d7
@pmatyjasek-sumo
Rework Settings structure to fit all requirements.
567c570 
Split it into ServiceSettings and ApplicationSettings.

Signed-off-by: Patryk Matyjasek <pmatyjasek@sumologic.com>

# Conflicts:
#	CHANGELOG.md
#	service/application_windows.go
@pmatyjasek-sumo
Fix linter issues:
77438b6 
- Fix import orders
- Rename stutter structs

Signed-off-by: Patryk Matyjasek <pmatyjasek@sumologic.com>

# Conflicts:
#	CHANGELOG.md
#	service/application_windows.go
@pmatyjasek-sumo
Remove CommonSettings struct,
13ca9f2 
Make SvcSettings private

Signed-off-by: Patryk Matyjasek <pmatyjasek@sumologic.com>
@pmatyjasek-sumo
Remove unused Settings struct.
5e910c6 
Fix Windows tests

Signed-off-by: Patryk Matyjasek <pmatyjasek@sumologic.com>
@pmatyjasek-sumo
Copy link
Contributor Author

pmatyjasek-sumo commented May 21, 2021 •
edited
Loading

I've fixed Windows test, and rebase code to latest changes.

Tests failed due to:

2021/05/21 11:52:28 application run finished with error: cannot setup pipelines: cannot start receivers: listen tcp 127.0.0.1:46785: bind: address already in use```

@bogdandrutu bogdandrutu merged commit 41734c5 into open-telemetry:main May 21, 2021
dashpole pushed a commit to dashpole/opentelemetry-collector that referenced this pull request Jun 14, 2021
@pmatyjasek-sumo @dashpole
Standarize Settings, Params and Parameters (open-telemetry#3163)
6875ea8 
* Standarize Settings, Params and Parameters
Replace Parameters and settings structs with new struct Settings
Replace dependencies in service and main
Update tests

Signed-off-by: Patryk Matyjasek <pmatyjasek@sumologic.com>

# Conflicts:
#	service/application_windows.go

* Fix unnecessary file

* Rework Settings structure to fit all requirements.
Split it into ServiceSettings and ApplicationSettings.

Signed-off-by: Patryk Matyjasek <pmatyjasek@sumologic.com>

# Conflicts:
#	CHANGELOG.md
#	service/application_windows.go

* Fix linter issues:
- Fix import orders
- Rename stutter structs

Signed-off-by: Patryk Matyjasek <pmatyjasek@sumologic.com>

# Conflicts:
#	CHANGELOG.md
#	service/application_windows.go

* Remove CommonSettings struct,
Make SvcSettings private

Signed-off-by: Patryk Matyjasek <pmatyjasek@sumologic.com>

* Remove unused Settings struct.
Fix Windows tests

Signed-off-by: Patryk Matyjasek <pmatyjasek@sumologic.com>

* Update CHANGELOG.md

Co-authored-by: Bogdan Drutu <lazy@splunk.com>
@fangyi-zhou fangyi-zhou mentioned this pull request Jun 16, 2021
Merged
sodabrew added a commit to sodabrew/opentelemetry-collector-builder that referenced this pull request Jun 16, 2021
@sodabrew
Update to OpenTelemtry Collector 0.28
993672d 
Switch main template from service.Parameters to service.AppSettings as
per open-telemetry/opentelemetry-collector#3163
@sodabrew sodabrew mentioned this pull request Jun 16, 2021
Closed
sodabrew added a commit to sodabrew/opentelemetry-collector-builder that referenced this pull request Jun 16, 2021
@sodabrew
Update to OpenTelemetry Collector 0.28
a3b4895 
Switch main template from service.Parameters to service.AppSettings as
per open-telemetry/opentelemetry-collector#3163
jpkrohling pushed a commit to open-telemetry/opentelemetry-collector-builder that referenced this pull request Jun 24, 2021
@fangyi-zhou
Update to Collector v0.28.0 (#49)
16563b6 
* Update to Collector v0.28.0

Closes #48

Addresses the breaking API change in
open-telemetry/opentelemetry-collector#3163,
besides the usual version number changes.

Signed-off-by: Fangyi Zhou <me@fangyi.io>

* Use `go mod tidy` instead of `go mod download`

It appears that this magically resolves the go.mod file issue.
https://stackoverflow.com/questions/67203641/missing-go-sum-entry-for-module-providing-package-package-name

Signed-off-by: Fangyi Zhou <me@fangyi.io>
bogdandrutu added a commit that referenced this pull request Oct 28, 2021
@jpkrohling @bogdandrutu
@joe-elliott @jiwen624 @Ashmita152 @fangyi-zhou @crearys @pmalek-sumo @secat @sodabrew @pmalek @KKelvinLo @himanshu007-creator @u5surf @zchee @Aneurysm9 @loomis-relativity
Move opentelemetry-collector-builder to core (#4286)
4063a46 
* Initial commit

* Add CODEOWNERS file (#2)

* Add CODEOWNERS file

* Update CODEOWNERS

* Moved from github.com/observatorium/opentelemetry-collector-builder (#3)

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>

* fixed panics (#6)

Signed-off-by: Joe Elliott <number101010@gmail.com>

* Replace master with main in CI and mergify files (#8)

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>

* Bump to OpenTelemetry Collector 0.20.0 (#10)

Closes #9

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>

* Explicitly enable Go modules in quickstart instructions (#13)

* Update to collector v0.21.0 (#17)

Fixes #16

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>

* Update to collector v0.22.0 (#19)

* Download go modules before building (#20)

Fixes #14

* Add version command (#25)

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>

* Pass errors from cobra Execute back to main for correct exit code (#28)

* pass errors from cobra execute back to main

* print the error

* Update to collector v0.23.0 (#27)

* Generate a warning if the builder and collector base version mismatch (#30)

* Generate a warning if the builder and collector base version mismatch

* Show current default version in the warning message

* Update to OpenTelemetry Collector 0.24.0

* Don't use %w formatting with log.Fatal (#35)

* Update to OpenTelemetry Collector 0.25.0 (#36)

Signed-off-by: Serge Catudal <serge.catudal@gmail.com>

* Update to 0.26.0 and update BuildInfo (#39)

* Sync build and CI Go versions at latest 1.16 (#34)

* Sync build and CI Go versions at latest 1.16

* Run go mod tidy

* Set go binary to use in the compilation phase in tests

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>

Co-authored-by: Juraci Paixão Kröhling <juraci@kroehling.de>

* Add option to generate go code only (no compile) (#40)

* Issue#24 Add option to generate go code only (no compile)

* Update cmd/root.go logging

Suggested by @jpkkrohling

Co-authored-by: Juraci Paixão Kröhling <juraci.github@kroehling.de>

* remove verbose help .. created by corba

* suggestion by jpkrohling to keep generateandcompile

* lint error: remove unused var

* reword cmd option and add back help message for default

Co-authored-by: Juraci Paixão Kröhling <juraci.github@kroehling.de>

* Don't reuse exec.Cmd (#42)

* Update to OpenTelemetry Collector 0.27.0 (#43)

* Add CI Badge (#47)

* Update to Collector v0.28.0 (#49)

* Update to Collector v0.28.0

Closes #48

Addresses the breaking API change in
#3163,
besides the usual version number changes.

Signed-off-by: Fangyi Zhou <me@fangyi.io>

* Use `go mod tidy` instead of `go mod download`

It appears that this magically resolves the go.mod file issue.
https://stackoverflow.com/questions/67203641/missing-go-sum-entry-for-module-providing-package-package-name

Signed-off-by: Fangyi Zhou <me@fangyi.io>

* Account for go mod download in go1.17 not updating go.sum (#50)

* Update to collector v0.29.0 (#54)

* Update replaces.builder.yaml

* Update nocore.builder.yaml

* Update config.go

* Update README.md

* Update main.go

* Update to collector v0.30.0 (#57)

* cmd: fix module flag default value to github.com/open-telemetry (#58)

Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>

* Update to collector v0.31.0 (#60)

* Update to v0.33.0 (#62)

Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com>

* Add excludes support to generated go.mod (#63)

Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com>

Co-authored-by: Juraci Paixão Kröhling <juraci@kroehling.de>

* Small cleanup for the builder files (#64)

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>

* Support building with Go 1.17 (#66)

* Support building with Go 1.17
Fixes #65

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>

* Update workflows to use Go 1.17

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>

* Add gosec exceptions for exec.Command

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>

* Update to OpenTelemetry core 0.34.0 (#68)

Fixes #67

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>

* Upgrade to OpenTelemetry Collector 0.35.0 (#70)

Signed-off-by: Fangyi Zhou <me@fangyi.io>

* Upgrade to OpenTelemetry Collector 0.36.0 (#76)

* Generate custom service code for Windows (#75)

* update main to include windows service code

* use main version from tag 0.35.0

* update main function

* align with upstream v0.36.0 tag

* dummy change to trigger build

* Revert "dummy change to trigger build"

This reverts commit 629d499461da2d2c240bf1e495b5fe0558e3547f.

* Remove Core from Module type (#77)

Fixes #15

Signed-off-by: yugo-horie <u5.horie@gmail.com>

* release 0.37.0 (#78)

* release 0.37.0

* update use of NewCommand

* Move builder to subdirectory

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>

Co-authored-by: Bogdan Drutu <lazy@splunk.com>
Co-authored-by: Bogdan Drutu <bogdandrutu@gmail.com>
Co-authored-by: Joe Elliott <joe.elliott@grafana.com>
Co-authored-by: Eric Yang <jiwen624@gmail.com>
Co-authored-by: Brian Gibbins <eroteme@supernought.co.uk>
Co-authored-by: Ashmita <ashmita.bohara152@gmail.com>
Co-authored-by: Fangyi Zhou <me@fangyi.io>
Co-authored-by: Shaun Creary <65406540+crearys@users.noreply.github.com>
Co-authored-by: Patryk Małek <69143962+pmalek-sumo@users.noreply.github.com>
Co-authored-by: Serge Catudal <serge.catudal@gmail.com>
Co-authored-by: Aaron Stone <aaron@serendipity.cx>
Co-authored-by: Patryk Małek <pmalek@sumologic.com>
Co-authored-by: Aaron Stone <aaron.stone@udacity.com>
Co-authored-by: Kelvin Lo <kello@live.ca>
Co-authored-by: Himanshu <addyjeridiq@gmail.com>
Co-authored-by: Y.Horie <u5.horie@gmail.com>
Co-authored-by: Koichi Shiraishi <zchee.io@gmail.com>
Co-authored-by: Anthony Mirabella <a9@aneurysm9.com>
Co-authored-by: Cal Loomis <68860480+loomis-relativity@users.noreply.github.com>
Co-authored-by: alrex <aboten@lightstep.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bogdandrutu bogdandrutu bogdandrutu approved these changes

@carlosalberto carlosalberto carlosalberto approved these changes

Assignees
No one assigned
Labels
waiting-for-author
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Standardize on params vs settings vs options
3 participants
@pmatyjasek-sumo @bogdandrutu @carlosalberto