-
Notifications
You must be signed in to change notification settings - Fork 1.5k
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
Rename service.Application to service.Collector #3268
Rename service.Application to service.Collector #3268
Conversation
- Changed references in function/method docs from 'application' to 'collector server' - Changed instance variable names from (app *Application) to (col *Collector)
- renamed files in service/application* to service/collector* - replaced occurrences of app to col
…rename-serviceApplication-conflict
…y-collector into rename-serviceApplication-conflict
Small nit: maybe |
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.
One suggestion, otherwise LGTM.
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.
Left some comments.
@@ -79,36 +79,36 @@ func (s *WindowsService) Execute(args []string, requests <-chan svc.ChangeReques | |||
return false, 0 | |||
} | |||
|
|||
func (s *WindowsService) start(elog *eventlog.Log, appErrorChannel chan error) error { | |||
func (s *WindowsService) start(elog *eventlog.Log, colErrorChannel chan error) error { |
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.
We probably want to rename the WindowsService to WindowsCollector.
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.
Maybe, ignore this for now and we can take another loop if any naming is required before we cut the stable release.
I think there is a commit from @xukaren who did not sign the CLA that's why the check is failing. It is best to avoid having multiple people committing to the same PR to avoid confusion. |
The commits coming from xukaren is not relevant to this PR. Can we fix the PR? This is a big breaking change and we need to merge it, sooner the better. |
I think my commits were included by mistake, and I don't see them in the files changed for this PR. |
@rakyll will get this PR fixed. It might be easier to open a new PR. @eddyleelin @xukaren please sync up and fix this issue. |
- Changed references in function/method docs from 'application' to 'collector server' - Changed instance variable names from (app *Application) to (col *Collector)
- renamed files in service/application* to service/collector* - replaced occurrences of app to col
From v0.28.0-beta to unreleased (breaking change)
…om/open-o11y/opentelemetry-collector into rename-serviceApplication-resolved
I apologize for including the incorrect commits by mistake (again, my fault!). I have rebased all commits that had previously got approved; they now show up with the new commits 5d1987d..ad55466, so the history for the PR should now be clean (even though the previous commits will still show up on this page). It also includes the most recent commit e4fb185 to fix up a small issue where I had deleted a new line on accident during a merge conflict. It seems like the currently failing tests are unrelated to my changes (besides the contrib test, which is addressed by the PR linked in the main comment). Thanks again to everyone for the patience and help along the way, and sorry again for the trouble! 😄 |
@eddyleelin thanks for fixing the commit history. Can you make sure the required tests are passing? |
@eddyleelin please rebase to fix some of the errors fixed on head |
Awesome, thanks @bogdandrutu ! |
Metropolitan Commercial Bank |
Description:
Breaking change: Changed the naming of the collector server to service.Collector (previously named service.Application, which could be confused with the user applications to instrument).
Link to tracking Issue:
Addresses #3175
Testing:
Local
make
does not report any errors in the files changed.Documentation:
TODO