-
Notifications
You must be signed in to change notification settings - Fork 780
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 oltp_endpoint to otlp_endpoint to match opentelemetry spec and lib name #5068
Conversation
…ame and spec Signed-off-by: bha <bryan.hamade@marketlogicsoftware.com>
Signed-off-by: bha <bryan.hamade@marketlogicsoftware.com>
Signed-off-by: bha <bryan.hamade@marketlogicsoftware.com>
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.
Thanks for this change. It makes sense to me.
I also agree.. thanks for pointing this out… I just wonder if there is a way to keep both configs for some time (maybe hiding from the docs and giving a warn on the logs) so we don’t break customers that are already using this config |
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.
Thanks!
@alanprot To me otlp support is experimental, we need to put it in v1.x Guarantees as we do with all new risky features.
I agree this feature is just experimental and we shoulbe be able to change it. |
Its not marked as experimental though, right? But iI'm ok either way i guess... |
Maybe we should follow the doc and make sure we are backward compatible. |
No, it's not experimental. That was just a suggestion.
yes, that is the way forward. fyi @sharkymcdongles |
@friedrichg I will make changes then this week. Cheers! |
Signed-off-by: bha <bryan.hamade@marketlogicsoftware.com>
@friedrichg I just made some adjustments hope it is okay. Was a quick and dirty during a too long meeting where I was bored af and wanted something to distract me. |
Signed-off-by: sharkymcdongles <bryanfcarmichael@gmail.com>
Whoopsie daisies, I forgot I am working with Golang and not Python and did some stupid stuff. Fixed. |
Signed-off-by: sharkymcdongles <bryanfcarmichael@gmail.com>
Not really sure what is failing now. Anyone able to help? I didn't touch the compactor, and my documentation looks proper. |
Signed-off-by: sharkymcdongles <bryanfcarmichael@gmail.com>
NM seems it was the newline. Not sure about the compactor test though. |
if (c.Otel.OtlpEndpoint == "") && (len(c.Otel.OltpEndpoint) > 0) { | ||
level.Warn(util_log.Logger).Log("msg", "DEPRECATED: otel.oltp is deprecated use otel.otlp") | ||
options = []otlptracegrpc.Option{ | ||
otlptracegrpc.WithEndpoint(c.Otel.OltpEndpoint), | ||
} | ||
} |
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.
If both are set OtlpEndpoint
should take precedence (this will happen when we are migrating from the old config to the new one)
Something like:
if (len(c.Otel.OtlpEndpoint) > 0) && (len(c.Otel.OltpEndpoint) > 0) {
level.Warn(util_log.Logger).Log("msg", "DEPRECATED: otel.otlp and otel.oltp both set, using otel.otlp because otel.oltp is deprecated")
}
otlpEndpoint := c.Otel.OltpEndpoint
if len(otlpEndpoint) == 0 {
otlpEndpoint = c.Otel.OltpEndpoint
}
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.
I already did that here: 91
Logic is:
If both are set log warning that both are set and otel.oltp will be removed and set options to use OtlpEndpoint.
If only OltpEndpoint is set then use it and warn as well.
Then once it is fully removed then both the if from 91 and 99 can be removed.
Maybe there is a cleaner way than this if else condition though not sure.
Signed-off-by: sharkymcdongles <bryanfcarmichael@gmail.com>
Signed-off-by: sharkymcdongles <bryanfcarmichael@gmail.com>
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.
test failure is not related
Signed-off-by: Bryan <bryanfcarmichael@gmail.com>
This is a flaky test we need to take care of. Will create a separate pr to track |
… lib name (cortexproject#5068) * rename oltp_endpoint to otlp_endpoint to be consistent with library name and spec Signed-off-by: bha <bryan.hamade@marketlogicsoftware.com> * update changelog Signed-off-by: bha <bryan.hamade@marketlogicsoftware.com> * change BUGFIX to CHANGE Signed-off-by: bha <bryan.hamade@marketlogicsoftware.com> * deprecate instead of remove Signed-off-by: bha <bryan.hamade@marketlogicsoftware.com> * fix errors because I forgot this is golang and not python lol Signed-off-by: sharkymcdongles <bryanfcarmichael@gmail.com> * improve documentation comment Signed-off-by: sharkymcdongles <bryanfcarmichael@gmail.com> * remove newline Signed-off-by: sharkymcdongles <bryanfcarmichael@gmail.com> * hide deprecated config Signed-off-by: sharkymcdongles <bryanfcarmichael@gmail.com> * remove hidden Signed-off-by: sharkymcdongles <bryanfcarmichael@gmail.com> --------- Signed-off-by: bha <bryan.hamade@marketlogicsoftware.com> Signed-off-by: sharkymcdongles <bryanfcarmichael@gmail.com> Signed-off-by: Bryan <bryanfcarmichael@gmail.com> Signed-off-by: Alex Le <leqiyue@amazon.com>
What this PR does:
Renames oltp_endpoint to otlp_endpoint to match opentelemetry spec and lib name
Which issue(s) this PR fixes:
Fixes #5067
Checklist
CHANGELOG.md
updated - the order of entries should be[CHANGE]
,[FEATURE]
,[ENHANCEMENT]
,[BUGFIX]