Skip to content

fix: bypass.override.tenants config to be non quoted #449

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 4 commits into from
Feb 5, 2024
Merged

fix: bypass.override.tenants config to be non quoted #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ed17fb
fix: bypass.override.tenants config to be non quoted
sanket-mundra Feb 2, 2024
6b39286
increase vuln expiry
sanket-mundra Feb 2, 2024
e83c244
test: using older pinot image to test e2e test case
Feb 5, 2024
bc19213
fixed e2e test for postgres too
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
2 changes: 1 addition & 1 deletion .github/workflows/hypertrace-ingester/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hypertrace-ingester/postgres/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions owasp-suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion span-normalizer/helm/templates/span-normalizer-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }}
Expand Down
1 change: 1 addition & 0 deletions span-normalizer/span-normalizer/src/test/resources/configs/span-normalizer/application.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down