feat: rename config flag to observe-config, use default otel command for our start command #146
Conversation
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
obs-gh-mattcotter
force-pushed
the
OB-38651-config-flag
branch
from
0432d62 to
c937854
Compare
| inService, err := svc.IsWindowsService() | ||
| if err != nil { | ||
| // If we're not running as a service, we run normally. | ||
| if inService, err := svc.IsWindowsService(); err != nil { |
There was a problem hiding this comment.
I reorganized this method so it now looks more like the default OCB method. The diff for this condition is just code motion.
| if err != nil { | ||
| return err | ||
| } | ||
| colSettings := observecol.GenerateCollectorSettingsWithConfigFiles(configFilePaths) |
There was a problem hiding this comment.
NB: Generating the settings this way instead of using the otel command means it won't work with --config. That's fine though, since we have a hard assert that the windows service is only ever run with two args and we have never supported --config this way.
| if err != nil { | ||
| return err | ||
| } | ||
| if cleanup != nil { | ||
| defer cleanup() | ||
| configFlag := otleCmd.Flags().Lookup("config") |
There was a problem hiding this comment.
The flags for the otel collector are hidden behind private implementations of interfaces, args passed by value, and function scope locals. It's really not possible to access and set them directly if you aren't passing args to the cmd flags. Because of this, I think using the otelcol command itself for our start subcommand is the best way to go.
| @@ -14,15 +14,7 @@ import ( | |||
| "go.opentelemetry.io/collector/otelcol" | |||
| ) | |||
|
|
|||
| func makeMapProvidersMap(providers ...confmap.Provider) map[string]confmap.Provider { | |||
There was a problem hiding this comment.
This was unused.
| if err != nil { | ||
| return false, nil, err | ||
| } | ||
| colSettings := observecol.GenerateCollectorSettingsWithConfigFiles(configFilePaths) |
There was a problem hiding this comment.
Diagnose won't run against otel config overrides, but we never supported this:
$ observe-agent diagnose --otel-config ./tmp.config
Error: unknown flag: --otel-config
Usage:
observe-agent diagnose [flags]
Flags:
-h, --help help for diagnose
Global Flags:
--config string config file path
There was a problem hiding this comment.
can you make a ticket to support the new --observe-config flag in diagnose?
There was a problem hiding this comment.
obs-gh-mattcotter
force-pushed
the
OB-38651-config-flag
branch
from
c937854 to
52df743
Compare
obs-gh-mattcotter
force-pushed
the
v2
branch
from
7882d2a to
b0fbd03
Compare
obs-gh-mattcotter
force-pushed
the
OB-38651-config-flag
branch
from
52df743 to
9d1d33e
Compare
…for our start command
obs-gh-mattcotter
force-pushed
the
OB-38651-config-flag
branch
from
9d1d33e to
6cdec3a
Compare
obs-gh-alexlew
approved these changes
Jan 6, 2025
obs-gh-mattcotter
added a commit
that referenced
this pull request
Jan 14, 2025
…for our start command (#146) ### Description OB-38651 Rename `--config` flag to `--observe-config` and use the default OTel collector command for our start command. This adds all `otelcol` flags to our `start` command and gives us full functionality for the new `--config` flag (which specifies OTel configs). ### Checklist - [ ] Created tests which fail without the change (if possible) - [ ] Extended the README / documentation, if necessary
obs-gh-mattcotter
added a commit
that referenced
this pull request
Jan 27, 2025
…for our start command (#146) ### Description OB-38651 Rename `--config` flag to `--observe-config` and use the default OTel collector command for our start command. This adds all `otelcol` flags to our `start` command and gives us full functionality for the new `--config` flag (which specifies OTel configs). ### Checklist - [ ] Created tests which fail without the change (if possible) - [ ] Extended the README / documentation, if necessary
obs-gh-mattcotter
added a commit
that referenced
this pull request
Feb 3, 2025
…for our start command (#146) ### Description OB-38651 Rename `--config` flag to `--observe-config` and use the default OTel collector command for our start command. This adds all `otelcol` flags to our `start` command and gives us full functionality for the new `--config` flag (which specifies OTel configs). ### Checklist - [ ] Created tests which fail without the change (if possible) - [ ] Extended the README / documentation, if necessary
obs-gh-mattcotter
added a commit
that referenced
this pull request
Feb 5, 2025
…for our start command (#146) ### Description OB-38651 Rename `--config` flag to `--observe-config` and use the default OTel collector command for our start command. This adds all `otelcol` flags to our `start` command and gives us full functionality for the new `--config` flag (which specifies OTel configs). ### Checklist - [ ] Created tests which fail without the change (if possible) - [ ] Extended the README / documentation, if necessary
obs-gh-mattcotter
added a commit
that referenced
this pull request
Feb 5, 2025
… for our start command (#146) OB-38651 Rename `--config` flag to `--observe-config` and use the default OTel collector command for our start command. This adds all `otelcol` flags to our `start` command and gives us full functionality for the new `--config` flag (which specifies OTel configs). - [ ] Created tests which fail without the change (if possible) - [ ] Extended the README / documentation, if necessary
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.
Description
OB-38651 Rename
--configflag to--observe-configand use the default OTel collector command for our start command. This adds allotelcolflags to ourstartcommand and gives us full functionality for the new--configflag (which specifies OTel configs).Checklist