Skip to content

Commit 4fa3a54

Browse files
fix: bypass.override.tenants config to be non quoted (#449)
1 parent fc4d7c0 commit 4fa3a54

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

.github/workflows/hypertrace-ingester/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ services:
8080
container_name: mongo
8181

8282
pinot:
83-
image: hypertrace/pinot-servicemanager:main
83+
image: hypertrace/pinot-servicemanager:0.6.10
8484
container_name: pinot
8585
environment:
8686
- LOG_LEVEL=error

.github/workflows/hypertrace-ingester/postgres/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ services:
9595

9696
# Stores spans and traces and provides aggregation functions
9797
pinot:
98-
image: hypertrace/pinot-servicemanager:main
98+
image: hypertrace/pinot-servicemanager:0.6.10
9999
container_name: pinot
100100
environment:
101101
- LOG_LEVEL=error

owasp-suppressions.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,14 @@
6767
<packageUrl regex="true">^pkg:maven/org\.hypertrace\.core\.kafkastreams\.framework/avro\-partitioners@.*$</packageUrl>
6868
<cve>CVE-2023-37475</cve>
6969
</suppress>
70-
<suppress until="2024-01-31Z">
70+
<suppress until="2024-02-29Z">
7171
<notes><![CDATA[
7272
Not yet fixed in quartz. file name: quartz-2.3.2.jar
7373
]]></notes>
7474
<packageUrl regex="true">^pkg:maven/org\.quartz\-scheduler/quartz@.*$</packageUrl>
7575
<cve>CVE-2023-39017</cve>
7676
</suppress>
77-
<suppress until="2024-01-30Z">
77+
<suppress until="2024-02-29Z">
7878
<notes><![CDATA[
7979
file name: json-20230618.jar
8080
]]></notes>
@@ -102,11 +102,11 @@
102102
<packageUrl regex="true">^pkg:maven/io\.netty/netty.*@.*$</packageUrl>
103103
<vulnerabilityName>CVE-2023-4586</vulnerabilityName>
104104
</suppress>
105-
<suppress until="2024-01-30Z">
105+
<suppress until="2024-02-29Z">
106106
<packageUrl regex="true">^pkg:maven/io\.netty/netty.*@.*$</packageUrl>
107107
<vulnerabilityName>CVE-2023-44487</vulnerabilityName>
108108
</suppress>
109-
<suppress until="2024-01-31Z">
109+
<suppress until="2024-02-29Z">
110110
<notes><![CDATA[
111111
This CVE (rapid RST) is already mitigated as our servers aren't directly exposed, but it's also
112112
addressed in 1.59.1, which the CVE doesn't reflect (not all grpc impls versions are exactly aligned).

span-normalizer/helm/templates/span-normalizer-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ data:
7272
{{- end }}
7373
7474
{{- if hasKey .Values.spanNormalizerConfig.processor "bypassOverrideTenants" }}
75-
bypass.override.tenants = "{{ .Values.spanNormalizerConfig.processor.bypassOverrideTenants | toJson }}"
75+
bypass.override.tenants = {{ .Values.spanNormalizerConfig.processor.bypassOverrideTenants | toJson }}
7676
{{- end }}
7777
7878
{{- if hasKey .Values.spanNormalizerConfig.processor "lateArrivalThresholdDuration" }}

span-normalizer/span-normalizer/src/test/resources/configs/span-normalizer/application.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ processor {
7272

7373
processor {
7474
bypass.key = "test.bypass"
75+
bypass.override.tenants = ["a", "b"]
7576
late.arrival.threshold.duration = "1d"
7677

7778
# Configuration for dropping certain attributes that are captured by agent, but doesn't require in

0 commit comments

Comments
 (0)