From 2ed17fb7724daaac0b22f621ab13db5ca36977e6 Mon Sep 17 00:00:00 2001
From: Sanket Mundra <sanket.mundra@traceable.ai>
Date: Fri, 2 Feb 2024 17:01:20 +0530
Subject: [PATCH 1/4] fix: bypass.override.tenants config to be non quoted

---
 span-normalizer/helm/templates/span-normalizer-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/span-normalizer/helm/templates/span-normalizer-config.yaml b/span-normalizer/helm/templates/span-normalizer-config.yaml
index 0a672ec6..33d819e9 100644
--- a/span-normalizer/helm/templates/span-normalizer-config.yaml
+++ b/span-normalizer/helm/templates/span-normalizer-config.yaml
@@ -72,7 +72,7 @@ data:
       {{- end }}
       
       {{- if hasKey .Values.spanNormalizerConfig.processor "bypassOverrideTenants" }}
-      bypass.override.tenants = "{{ .Values.spanNormalizerConfig.processor.bypassOverrideTenants | toJson }}"
+      bypass.override.tenants = {{ .Values.spanNormalizerConfig.processor.bypassOverrideTenants | toJson }}
       {{- end }}
 
       {{- if hasKey .Values.spanNormalizerConfig.processor "lateArrivalThresholdDuration" }}

From 6b39286fb0c779a128d06a2ecec01a096129f187 Mon Sep 17 00:00:00 2001
From: Sanket Mundra <sanket.mundra@traceable.ai>
Date: Fri, 2 Feb 2024 17:06:58 +0530
Subject: [PATCH 2/4] increase vuln expiry

---
 owasp-suppressions.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/owasp-suppressions.xml b/owasp-suppressions.xml
index 86dc9891..1847a8e8 100644
--- a/owasp-suppressions.xml
+++ b/owasp-suppressions.xml
@@ -67,14 +67,14 @@
     <packageUrl regex="true">^pkg:maven/org\.hypertrace\.core\.kafkastreams\.framework/avro\-partitioners@.*$</packageUrl>
     <cve>CVE-2023-37475</cve>
   </suppress>
-  <suppress until="2024-01-31Z">
+  <suppress until="2024-02-29Z">
     <notes><![CDATA[
    Not yet fixed in quartz. file name: quartz-2.3.2.jar
    ]]></notes>
     <packageUrl regex="true">^pkg:maven/org\.quartz\-scheduler/quartz@.*$</packageUrl>
     <cve>CVE-2023-39017</cve>
   </suppress>
-  <suppress until="2024-01-30Z">
+  <suppress until="2024-02-29Z">
     <notes><![CDATA[
    file name: json-20230618.jar
    ]]></notes>
@@ -102,11 +102,11 @@
     <packageUrl regex="true">^pkg:maven/io\.netty/netty.*@.*$</packageUrl>
     <vulnerabilityName>CVE-2023-4586</vulnerabilityName>
   </suppress>
-  <suppress until="2024-01-30Z">
+  <suppress until="2024-02-29Z">
     <packageUrl regex="true">^pkg:maven/io\.netty/netty.*@.*$</packageUrl>
     <vulnerabilityName>CVE-2023-44487</vulnerabilityName>
   </suppress>
-  <suppress until="2024-01-31Z">
+  <suppress until="2024-02-29Z">
     <notes><![CDATA[
    This CVE (rapid RST) is already mitigated as our servers aren't directly exposed, but it's also
    addressed in 1.59.1, which the CVE doesn't reflect (not all grpc impls versions are exactly aligned).

From e83c244e13442898acbff4a70e837cd69dd3d581 Mon Sep 17 00:00:00 2001
From: Ronak Kothari <ronakkothari@Ronaks-Laptop.local>
Date: Mon, 5 Feb 2024 12:55:40 +0530
Subject: [PATCH 3/4] test: using older pinot image to test e2e test case

---
 .github/workflows/hypertrace-ingester/docker-compose.yml        | 2 +-
 .../src/test/resources/configs/span-normalizer/application.conf | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/hypertrace-ingester/docker-compose.yml b/.github/workflows/hypertrace-ingester/docker-compose.yml
index 841eb08f..9c7e9d4a 100644
--- a/.github/workflows/hypertrace-ingester/docker-compose.yml
+++ b/.github/workflows/hypertrace-ingester/docker-compose.yml
@@ -80,7 +80,7 @@ services:
     container_name: mongo
 
   pinot:
-    image: hypertrace/pinot-servicemanager:main
+    image: hypertrace/pinot-servicemanager:0.6.10
     container_name: pinot
     environment:
       - LOG_LEVEL=error
diff --git a/span-normalizer/span-normalizer/src/test/resources/configs/span-normalizer/application.conf b/span-normalizer/span-normalizer/src/test/resources/configs/span-normalizer/application.conf
index 8aad824f..bda59c09 100644
--- a/span-normalizer/span-normalizer/src/test/resources/configs/span-normalizer/application.conf
+++ b/span-normalizer/span-normalizer/src/test/resources/configs/span-normalizer/application.conf
@@ -72,6 +72,7 @@ processor {
 
 processor {
   bypass.key = "test.bypass"
+  bypass.override.tenants = ["a", "b"]
   late.arrival.threshold.duration = "1d"
 
   # Configuration for dropping certain attributes that are captured by agent, but doesn't require in

From bc19213e935326569befd49cf1619990fd851582 Mon Sep 17 00:00:00 2001
From: Ronak Kothari <ronakkothari@Ronaks-Laptop.local>
Date: Mon, 5 Feb 2024 13:49:12 +0530
Subject: [PATCH 4/4] fixed e2e test for postgres too

---
 .../workflows/hypertrace-ingester/postgres/docker-compose.yml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/hypertrace-ingester/postgres/docker-compose.yml b/.github/workflows/hypertrace-ingester/postgres/docker-compose.yml
index ba745022..513cec8f 100644
--- a/.github/workflows/hypertrace-ingester/postgres/docker-compose.yml
+++ b/.github/workflows/hypertrace-ingester/postgres/docker-compose.yml
@@ -95,7 +95,7 @@ services:
 
   # Stores spans and traces and provides aggregation functions
   pinot:
-    image: hypertrace/pinot-servicemanager:main
+    image: hypertrace/pinot-servicemanager:0.6.10
     container_name: pinot
     environment:
       - LOG_LEVEL=error