From 0a1f8c803a2c862ca8f0b873a6d10f2651796dcd Mon Sep 17 00:00:00 2001
From: mihir gore <mihir@mihirs-MacBook-Pro.local>
Date: Mon, 6 Nov 2023 08:45:51 +0530
Subject: [PATCH 1/2] Fix NPE

---
 .../convention/utils/http/HttpSemanticConventionUtils.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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<String> getHttpHost(Event event) {
     Optional<String> 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());

From 42da9eb945d24c57c12adaaeb10470db766878c8 Mon Sep 17 00:00:00 2001
From: mihir gore <mihir@mihirs-MacBook-Pro.local>
Date: Mon, 6 Nov 2023 09:24:55 +0530
Subject: [PATCH 2/2] Fix Vuln

---
 .trivyignore              | 1 -
 gradle/libs.versions.toml | 4 ++--
 owasp-suppressions.xml    | 5 +++++
 3 files changed, 7 insertions(+), 3 deletions(-)

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 @@
    ]]></notes>
     <packageUrl regex="true">^pkg:maven/org\.json/json@.*$</packageUrl>
     <cve>CVE-2022-45688</cve>
+    <cve>CVE-2023-5072</cve>
   </suppress>
   <suppress>
     <notes><![CDATA[
@@ -101,4 +102,8 @@
     <packageUrl regex="true">^pkg:maven/io\.netty/netty.*@.*$</packageUrl>
     <vulnerabilityName>CVE-2023-4586</vulnerabilityName>
   </suppress>
+  <suppress until="2023-12-30Z">
+    <packageUrl regex="true">^pkg:maven/io\.netty/netty.*@.*$</packageUrl>
+    <vulnerabilityName>CVE-2023-44487</vulnerabilityName>
+  </suppress>
 </suppressions>
\ No newline at end of file