Skip to content

fix: path fetching for home paths Urls #448

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
sanket-mundra merged 3 commits into from
Feb 5, 2024
Merged

fix: path fetching for home paths Urls #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c37667
fix: path fetching for home paths Urls
sanket-mundra Feb 2, 2024
39317b1
Merge branch 'main' into sanket/fixHomePageApiCreation
sanket-mundra Feb 5, 2024
82254e3
Merge branch 'main' into sanket/fixHomePageApiCreation
sanket-mundra Feb 5, 2024
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
25 changes: 19 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 @@ -438,7 +438,7 @@ public static boolean isValidUrl(String url) {
}

public static URL getNormalizedUrl(String url) throws MalformedURLException, URISyntaxException {
String sanitizedUrl = StringUtils.stripStart(url, SLASH);
String sanitizedUrl = removeInitialSlashes(url);
URL absoluteUrl = new URL(new URL(RELATIVE_URL_CONTEXT), sanitizedUrl);
return absoluteUrl.toURI().normalize().toURL();
}
Expand Down Expand Up @@ -510,7 +510,7 @@ public static Optional<String> getHttpPath(Event event) {
if (StringUtils.isBlank(pathVal)) {
pathVal = SLASH;
}
return Optional.of(removeTrailingSlash(pathVal));
return Optional.of(removeTrailingSlashes(pathVal));
} catch (MalformedURLException | URISyntaxException e) {
LOGGER.debug(
"On extracting httpPath, received an invalid URL: {}, {}", url.get(), e.getMessage());
Expand All @@ -530,7 +530,7 @@ private static Optional<String> getHttpPathFromRawAttributes(Event event) {
if (attributeValueMap.get(path) != null) {
String s = attributeValueMap.get(path).getValue();
if (StringUtils.isNotBlank(s) && s.startsWith(SLASH)) {
return getPathFromUrlObject(s).map(HttpSemanticConventionUtils::removeTrailingSlash);
return getPathFromUrlObject(s).map(HttpSemanticConventionUtils::removeTrailingSlashes);
}
}
}
Expand Down Expand Up @@ -897,9 +897,22 @@ static Optional<String> getPathFromUrlObject(String urlPath) {
return Optional.empty();
}

private static String removeTrailingSlash(String s) {
// Ends with "/" and it's not home page path
return s.endsWith(SLASH) && s.length() > 1 ? s.substring(0, s.length() - 1) : s;
private static String removeTrailingSlashes(String url) {
// if it's home page path, then return /
Copy link
Copy Markdown
Contributor

@skjindal93 skjindal93 Feb 2, 2024

Choose a reason for hiding this comment

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

Suggested change
// if it's home page path, then return /
// if it's root URL, then return /

String updatedUrl = StringUtils.stripEnd(url, SLASH);
if (updatedUrl.isEmpty()) {
return SLASH;
}
return updatedUrl;
}

private static String removeInitialSlashes(String url) {
// if it's home page path, then return /
String updatedUrl = StringUtils.stripStart(url, SLASH);
if (updatedUrl.isEmpty()) {
return SLASH;
}
return updatedUrl;
}

@Nullable
Expand Down
16 changes: 16 additions & 0 deletions ...t/java/org/hypertrace/semantic/convention/utils/http/HttpSemanticConventionUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,4 +665,20 @@ public void testGetPrimaryDomain() {

Assertions.assertEquals(HttpSemanticConventionUtils.getPrimaryDomain("10.0.0.0"), "10.0.0.0");
}

@Test
void testGetPathFromUrlObject() {
Optional<String> path =
HttpSemanticConventionUtils.getPathFromUrlObject("http://app.test.com:9191/");
Assertions.assertTrue(path.isPresent());
Assertions.assertEquals("/", path.get());

path = HttpSemanticConventionUtils.getPathFromUrlObject("http://app.test.com:9191//");
Assertions.assertTrue(path.isPresent());
Assertions.assertEquals("/", path.get());

path = HttpSemanticConventionUtils.getPathFromUrlObject("http://app.test.com:9191//abc/def");
Assertions.assertTrue(path.isPresent());
Assertions.assertEquals("/abc/def", path.get());
}
}