diff --git a/.trivyignore b/.trivyignore index 8b1378917..e69de29bb 100644 --- a/.trivyignore +++ b/.trivyignore @@ -1 +0,0 @@ - diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1a91a84bb..ea5c94dc0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,9 +2,9 @@ hypertrace-entity-service = "0.8.78" hypertrace-config-service = "0.1.54" hypertrace-grpc-utils = "0.12.4" -hypertrace-serviceFramework = "0.1.60" +hypertrace-serviceFramework = "0.1.62" hypertrace-kafkaStreams = "0.4.3" -hypertrace-view-generator = "0.4.19" +hypertrace-view-generator = "0.4.20" grpc = "1.57.2" [libraries] diff --git a/owasp-suppressions.xml b/owasp-suppressions.xml index 3432d98a0..1244aa6db 100644 --- a/owasp-suppressions.xml +++ b/owasp-suppressions.xml @@ -80,6 +80,7 @@ ]]> ^pkg:maven/org\.json/json@.*$ CVE-2022-45688 + CVE-2023-5072 ^pkg:maven/io\.netty/netty.*@.*$ CVE-2023-4586 + + ^pkg:maven/io\.netty/netty.*@.*$ + CVE-2023-44487 + \ No newline at end of file diff --git a/semantic-convention-utils/src/main/java/org/hypertrace/semantic/convention/utils/http/HttpSemanticConventionUtils.java b/semantic-convention-utils/src/main/java/org/hypertrace/semantic/convention/utils/http/HttpSemanticConventionUtils.java index ec981e553..21a86b251 100644 --- a/semantic-convention-utils/src/main/java/org/hypertrace/semantic/convention/utils/http/HttpSemanticConventionUtils.java +++ b/semantic-convention-utils/src/main/java/org/hypertrace/semantic/convention/utils/http/HttpSemanticConventionUtils.java @@ -457,7 +457,7 @@ public static Optional getHttpHost(Event event) { Optional url = getHttpUrlFromRawAttributes(event); if (url.isPresent() && isAbsoluteUrl(url.get())) { try { - return Optional.of(getNormalizedUrl(url.get()).getAuthority()); + return Optional.ofNullable(getNormalizedUrl(url.get()).getAuthority()); } catch (MalformedURLException | URISyntaxException e) { LOGGER.warn( "On extracting httpHost, received an invalid URL: {}, {}", url.get(), e.getMessage());