-
Notifications
You must be signed in to change notification settings - Fork 2.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
[jaeger-v2] Align Cassandra Storage Config With OTEL #5928
Comments
@yurishkuro I had a question regarding the reuse of standard OTEL configs. For https://github.com/mahadzaryab1/jaeger/blob/main/pkg/cassandra/config/config.go#L37, should the type of this field be |
Yes |
hey @yurishkuro! i had a couple of questions about the TLS configs:
|
|
@yurishkuro whats the reason that we have tags with |
@yurishkuro here's my proposal for the groupings of the cassandra v2 configs. Do you have any feedback? Let me know if you prefer to review it on the PR instead. type Configuration struct {
Connection Connection `mapstructure:"connection"`
Data Data `mapstructure:"data"`
Timeout Timeout `mapstructure:"timeout"`
ProtoVersion int `mapstructure:"proto_version"`
Authenticator Authenticator `mapstructure:"auth"`
}
type Connection struct {
Servers []string `valid:"required,url" mapstructure:"servers"`
LocalDC string `mapstructure:"local_dc"`
Port int `mapstructure:"port"`
DisableAutoDiscovery bool `mapstructure:"-"`
ConnectionsPerHost int `mapstructure:"connections_per_host"`
ReconnectInterval time.Duration `mapstructure:"reconnect_interval"`
SocketKeepAlive time.Duration `mapstructure:"socket_keep_alive"`
MaxRetryAttempts int `mapstructure:"max_retry_attempts"`
TLS configtls.ClientConfig `mapstructure:"tls"`
}
type Data struct {
Keyspace string `mapstructure:"keyspace"`
DisableCompression bool `mapstructure:"disable_compression"`
Consistency string `mapstructure:"consistency"`
}
type Timeout struct {
Query time.Duration `mapstructure:"-"`
Connect time.Duration `mapstructure:"connection_timeout"`
}
type Authenticator struct {
Basic BasicAuthenticator `yaml:"basic" mapstructure:",squash"`
}
type BasicAuthenticator struct {
Username string `yaml:"username" mapstructure:"username"`
Password string `yaml:"password" mapstructure:"password" json:"-"`
AllowedAuthenticators []string `yaml:"allowed_authenticators" mapstructure:"allowed_authenticators"`
} |
No reason / laziness. v1 did not make any use of
Overall looks good to me, but a few thoughts:
|
I mostly just did for readability. Should I move the data groupings under connection?
I can move
Sure! |
I would flatten timeouts into Connection |
Why wouldn't auth go under connection? Consistency seems a connection concept, not schema's |
Thanks for your feedback! @yurishkuro. I'll address these and push up my changes. |
## Which problem is this PR solving? - Resolves #5928 ## Description of the changes - Revamped configuration for Cassandra to be logically grouped - Added unit tests for the `Validate` method - Changed the configuration to use OTEL's `configtls.ClientConfig` type - [Migration guide](https://docs.google.com/document/d/1mCcQJTYC1eEhNVI9HSR-F6A9gxK-GlEtSz0wiEbRxlU/edit) ## How was this change tested? - New unit tests - CI ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [x] I have added unit tests for the new functionality - [x] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `yarn lint` and `yarn test` --------- Signed-off-by: Mahad Zaryab <[email protected]> Signed-off-by: Yuri Shkuro <[email protected]> Co-authored-by: Yuri Shkuro <[email protected]>
Requirement
In this issue, we want to align the configuration for cassandra storage with OTEL (part of #5229)
Tasks / outcomes
The text was updated successfully, but these errors were encountered: