Skip to content

trace url bug fix #281

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Nov 8, 2021
Merged

trace url bug fix #281

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c09ff42
added condition on abs url
Nov 5, 2021
84e7ab4
nit
Nov 5, 2021
89610d1
nit
Nov 5, 2021
92e0b7e
refactored
Nov 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions .../main/java/org/hypertrace/semantic/convention/utils/http/HttpSemanticConventionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,10 @@ public static boolean isAbsoluteUrl(String urlStr) {
*/
public static Optional<String> getHttpUrlForOTelFormat(
Map<String, AttributeValue> attributeValueMap) {
if (attributeValueMap.containsKey(HTTP_URL.getValue())) {
return Optional.of(attributeValueMap.get(HTTP_URL.getValue()).getValue());
Optional<String> httpUrlForOTelFormat = Optional.empty();
if (attributeValueMap.containsKey(HTTP_URL.getValue())
&& isAbsoluteUrl(attributeValueMap.get(HTTP_URL.getValue()).getValue())) {
Copy link
Contributor

@findingrish findingrish Nov 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if this is not an absolute url but we don't have enough attributes to build the url as well?

Copy link
Member Author

@sarthak77 sarthak77 Nov 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fallback to present case only?

httpUrlForOTelFormat = Optional.of(attributeValueMap.get(HTTP_URL.getValue()).getValue());
} else if (attributeValueMap.containsKey(HTTP_SCHEME.getValue())
&& attributeValueMap.containsKey(HTTP_HOST.getValue())
&& attributeValueMap.containsKey(HTTP_TARGET.getValue())) {
Expand All @@ -195,15 +197,19 @@ public static Optional<String> getHttpUrlForOTelFormat(
attributeValueMap.get(HTTP_SCHEME.getValue()).getValue(),
attributeValueMap.get(HTTP_HOST.getValue()).getValue(),
attributeValueMap.get(HTTP_TARGET.getValue()).getValue());
return Optional.of(url);
httpUrlForOTelFormat = Optional.of(url);
} else if (SpanSemanticConventionUtils.isClientSpanForOtelFormat(attributeValueMap)
|| SpanSemanticConventionUtils.isClientSpanForOCFormat(attributeValueMap)) {
return getHttpUrlForOtelFormatClientSpan(attributeValueMap);
httpUrlForOTelFormat = getHttpUrlForOtelFormatClientSpan(attributeValueMap);
} else if (SpanSemanticConventionUtils.isServerSpanForOtelFormat(attributeValueMap)
|| SpanSemanticConventionUtils.isServerSpanForOCFormat(attributeValueMap)) {
return getHttpUrlForOtelFormatServerSpan(attributeValueMap);
httpUrlForOTelFormat = getHttpUrlForOtelFormatServerSpan(attributeValueMap);
}
return Optional.empty();

if (httpUrlForOTelFormat.isEmpty() && attributeValueMap.containsKey(HTTP_URL.getValue())) {
return Optional.of(attributeValueMap.get(HTTP_URL.getValue()).getValue());
}
return httpUrlForOTelFormat;
}

private static Optional<String> getHttpUrlForOtelFormatClientSpan(
Expand Down