Move processing of endpoints to UriEndpoint and SocketEndpoint #3950
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
|
@BrynCooke, please consider creating a changeset entry in |
|
CI performance tests
|
BrynCooke
force-pushed
the
bryn/endpoint2
branch
from
9f3777a to
26bcbe8
Compare
This removes duplicated logic across exporters. Part of #3226
BrynCooke
force-pushed
the
bryn/endpoint2
branch
from
26bcbe8 to
9e01cd6
Compare
BrynCooke
commented
Oct 2, 2023
| @@ -5336,6 +5333,9 @@ expression: "&schema" | |||
| "zipkin": { | |||
| "description": "Zipkin exporter configuration", | |||
| "type": "object", | |||
| "required": [ | |||
There was a problem hiding this comment.
This should have been required all along.
BrynCooke
commented
Oct 2, 2023
| @@ -4949,8 +4947,7 @@ expression: "&schema" | |||
| "properties": { | |||
| "endpoint": { | |||
| "description": "The endpoint to send reports to", | |||
| "type": "string", | |||
| "format": "uri" | |||
There was a problem hiding this comment.
I may follow up to reintroduce format into the schema.
There was a problem hiding this comment.
Actually, this is a mistake. We accept default, which is not a URI, so this must just be a string.
We may move away from accepting default in future.
BrynCooke
commented
Oct 2, 2023
| } | ||
| let mut url = Url::parse(&s).map_err(serde::de::Error::custom)?; | ||
|
|
||
| // support the case of 'collector:4317' where url parses 'collector' |
There was a problem hiding this comment.
Note this is tested in UriEndpoint:
assert_eq!(
UriEndpoint::from(Uri::from_static("example.com:2000"))
.to_uri(&Uri::from_static("http://localhost:9411/path2"))
.unwrap(),
Uri::from_static("http://example.com:2000/path2")
);
```
Open
28 tasks
bnjjj
reviewed
Oct 3, 2023
|
|
||
| #[derive(Debug, Clone, Default, Eq, PartialEq)] | ||
| pub(crate) struct UriEndpoint { | ||
| uri: Option<Uri>, |
There was a problem hiding this comment.
The option is only needed to support the legacy format with default ? If yes, could you document it here please ?
bnjjj
approved these changes
Oct 3, 2023
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.
We have multiple places in the code that deal with endpoint parsing for otel exporters.
This PR removes duplicated logic across exporters and adds some tests.
The new types implement default and will allow us to use serde default in a follow up PR.
Part of #3226
Checklist
Complete the checklist (and note appropriate exceptions) before the PR is marked ready-for-review.
Exceptions
Note any exceptions here
Notes
Footnotes
It may be appropriate to bring upcoming changes to the attention of other (impacted) groups. Please endeavour to do this before seeking PR approval. The mechanism for doing this will vary considerably, so use your judgement as to how and when to do this. ↩
Configuration is an important part of many changes. Where applicable please try to document configuration examples. ↩
Tick whichever testing boxes are applicable. If you are adding Manual Tests, please document the manual testing (extensively) in the Exceptions. ↩