Refactor codebase for typed port parsers #2880
Closed
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
jaronoff97
commented
Apr 18, 2024
apis/v1beta1/config.go
Outdated
Comment on lines
96
to
106
| func (c *Config) GetReceivers() []parser.ComponentPortParser { | ||
| var receiverList []parser.ComponentPortParser | ||
| for name, config := range c.Receivers.Object { | ||
| parser, err := receiver.For(name, config) | ||
| if err != nil { | ||
| continue | ||
| } | ||
| receiverList = append(receiverList, parser) | ||
| } | ||
| return receiverList | ||
| } |
There was a problem hiding this comment.
I was thinking we could even introduce a full struct for "keys" or something... but that feels like maybe a slippery slope!
jaronoff97
commented
Apr 18, 2024
| "flinkmetrics": {}, | ||
| "couchdb": {}, | ||
| } | ||
| genericReceivers = map[string][]parser.SinglePortOption{ |
There was a problem hiding this comment.
Pretty much all of our receivers can be done without any customization beyond what's here
jaronoff97
commented
Apr 18, 2024
| @@ -71,36 +71,35 @@ func ConfigToComponentPorts(logger logr.Logger, cType ComponentType, config map[ | |||
| } | |||
|
|
|||
| ports := []corev1.ServicePort{} | |||
| for key, val := range components { | |||
There was a problem hiding this comment.
this function doesn't entirely work yet. I need to refactor this to be far simpler
jaronoff97
commented
Apr 18, 2024
| return []monitoringv1.PodMetricsEndpoint{} | ||
| } | ||
| exporterPorts, err := adapters.ConfigToComponentPorts(logger, adapters.ComponentTypeExporter, config) | ||
| exporterPorts, err := adapters.ConfigToComponentPorts(logger, adapters.ComponentTypeExporter, otelcol.Spec.Config.Exporters.Object) |
There was a problem hiding this comment.
also doesn't work yet
jaronoff97
commented
Apr 18, 2024
Comment on lines
+28
to
+33
| func NewPrometheusExporterParser(name string, config interface{}) (parser.ComponentPortParser, error) { | ||
| return parser.CreateParser( | ||
| parser.WithSinglePort(defaultPrometheusPort, | ||
| parser.WithTargetPort(defaultPrometheusPort), | ||
| parser.WithProtocol(corev1.ProtocolTCP)), | ||
| )(name, config) |
There was a problem hiding this comment.
a million times cleaner :)
jaronoff97
commented
Apr 19, 2024
| @@ -90,6 +114,62 @@ type Config struct { | |||
| Service Service `json:"service" yaml:"service"` | |||
| } | |||
|
|
|||
| // GetEnabledComponents constructs a list of enabled components by component type. | |||
| func (c *Config) GetEnabledComponents() map[ComponentType]map[string]interface{} { | |||
There was a problem hiding this comment.
This is a pretty simple change to break out, it will trim a few hundred lines too!
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: Refactors the codebase for allowing typed parsers. Removes the
zipkin-scribeparser which has been deleted for a whileLink to tracking Issue(s):
Testing:
Documentation: