Skip to content
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

[Chore] Fix asserts after upgrade to Tempo 2.7 #1112

Merged
merged 2 commits into from
Feb 7, 2025
Merged

[Chore] Fix asserts after upgrade to Tempo 2.7 #1112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c77a54b
Fix asserts after upgrade to Tempo 2.7
IshwarKanse Feb 6, 2025
2da63b4
Merge branch 'main' into tempo27
IshwarKanse Feb 7, 2025
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
6 changes: 4 additions & 2 deletions tests/e2e-openshift/monolithic-route/install-tempo-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,10 @@ data:
receivers:
otlp:
protocols:
grpc: {}
http: {}
grpc:
endpoint: 0.0.0.0:4317
http:
endpoint: 0.0.0.0:4318
usage_report:
reporting_enabled: false
kind: ConfigMap
Expand Down
3 changes: 3 additions & 0 deletions tests/e2e-openshift/route/install-tempo-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ data:
grpc:
endpoint: 0.0.0.0:14250
zipkin:
endpoint: 0.0.0.0:9411
otlp:
protocols:
grpc:
Expand Down Expand Up @@ -112,6 +113,7 @@ data:
reporting_enabled: false
query_frontend:
search:
max_spans_per_span_set: 0
concurrent_jobs: 2000
max_duration: 0s
default_result_limit: 20
Expand Down Expand Up @@ -229,6 +231,7 @@ data:
reporting_enabled: false
query_frontend:
search:
max_spans_per_span_set: 0
concurrent_jobs: 2000
max_duration: 0s
default_result_limit: 20
Expand Down
2 changes: 2 additions & 0 deletions tests/e2e-openshift/tls-monolithic-singletenant/01-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,11 +327,13 @@ data:
cert_file: /var/run/tls/receiver/grpc/tls.crt
key_file: /var/run/tls/receiver/grpc/tls.key
min_version: "1.3"
endpoint: 0.0.0.0:4317
http:
tls:
cert_file: /var/run/tls/receiver/http/tls.crt
key_file: /var/run/tls/receiver/http/tls.key
min_version: "1.3"
endpoint: 0.0.0.0:4318
usage_report:
reporting_enabled: false
kind: ConfigMap
Expand Down
331 changes: 252 additions & 79 deletions tests/e2e-openshift/tls-singletenant/01-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,91 +187,264 @@ apiVersion: v1
data:
overrides.yaml: |
overrides:
tempo-query-frontend.yaml: "compactor:\n compaction:\n block_retention: 48h0m0s\n
\ ring:\n kvstore:\n store: memberlist\ndistributor:\n receivers:\n jaeger:\n
\ protocols:\n thrift_http:\n endpoint: 0.0.0.0:14268\n tls:\n
\ cert_file: /var/run/tls/receiver/tls.crt\n key_file: /var/run/tls/receiver/tls.key\n
\ min_version: \n thrift_binary:\n endpoint: 0.0.0.0:6832\n
\ thrift_compact:\n endpoint: 0.0.0.0:6831\n grpc:\n endpoint:
0.0.0.0:14250\n tls:\n cert_file: /var/run/tls/receiver/tls.crt\n
\ key_file: /var/run/tls/receiver/tls.key\n min_version:
\n zipkin:\n tls:\n cert_file: /var/run/tls/receiver/tls.crt\n
\ key_file: /var/run/tls/receiver/tls.key\n min_version: \n otlp:\n
\ protocols:\n grpc:\n endpoint: 0.0.0.0:4317\n tls:\n
\ cert_file: /var/run/tls/receiver/tls.crt\n key_file: /var/run/tls/receiver/tls.key\n
\ min_version: \n http:\n endpoint: 0.0.0.0:4318\n tls:\n
\ cert_file: /var/run/tls/receiver/tls.crt\n key_file: /var/run/tls/receiver/tls.key\n
\ min_version: \n ring:\n kvstore:\n store: memberlist\ningester:\n
\ lifecycler:\n ring:\n kvstore:\n store: memberlist\n replication_factor:
1\n tokens_file_path: /var/tempo/tokens.json\n max_block_duration: 10m\nmemberlist:\n
\ abort_if_cluster_join_fails: false\n join_members:\n - tempo-simplest-gossip-ring\nmultitenancy_enabled:
false\nquerier:\n max_concurrent_queries: 20\n frontend_worker:\n frontend_address:
tempo-simplest-query-frontend-discovery:9095\n grpc_client_config:\n tls_enabled:
true\n tls_cert_path: /var/run/tls/server/tls.crt\n tls_key_path: /var/run/tls/server/tls.key\n
\ tls_ca_path: /var/run/ca/service-ca.crt\n tls_server_name: tempo-simplest-query-frontend.chainsaw-tls-singletenant.svc.cluster.local\n
\ tls_min_version: VersionTLS13\n search:\n external_hedge_requests_at:
8s\n external_hedge_requests_up_to: 2\nserver:\n grpc_server_max_recv_msg_size:
4194304\n grpc_server_max_send_msg_size: 4194304\n http_listen_port: 3200\n
\ http_server_read_timeout: 30s\n http_server_write_timeout: 30s\n log_format:
logfmt\n tls_min_version: VersionTLS13\n grpc_tls_config:\n cert_file: /var/run/tls/server/tls.crt\n
\ key_file: /var/run/tls/server/tls.key\n client_ca_file: /var/run/ca/service-ca.crt\n
\ client_auth_type: RequireAndVerifyClientCert\nstorage:\n trace:\n backend:
s3\n blocklist_poll: 5m\n cache: none\n s3:\n endpoint: minio:9000\n
\ bucket: tempo\n insecure: true\n local:\n path: /var/tempo/traces\n
\ wal:\n path: /var/tempo/wal\nusage_report:\n reporting_enabled: false\nquery_frontend:\n
\ search:\n concurrent_jobs: 2000\n max_duration: 0s\n default_result_limit:
20\ningester_client:\n grpc_client_config:\n tls_enabled: true\n tls_cert_path:
\ /var/run/tls/server/tls.crt\n tls_key_path: /var/run/tls/server/tls.key\n
\ tls_ca_path: /var/run/ca/service-ca.crt\n tls_server_name: tempo-simplest-ingester.chainsaw-tls-singletenant.svc.cluster.local\n
\ tls_insecure_skip_verify: false\n tls_min_version: VersionTLS13\n"
tempo-query-frontend.yaml: |
compactor:
compaction:
block_retention: 48h0m0s
ring:
kvstore:
store: memberlist
distributor:
receivers:
jaeger:
protocols:
thrift_http:
endpoint: 0.0.0.0:14268
tls:
cert_file: /var/run/tls/receiver/tls.crt
key_file: /var/run/tls/receiver/tls.key
min_version: ""
thrift_binary:
endpoint: 0.0.0.0:6832
thrift_compact:
endpoint: 0.0.0.0:6831
grpc:
endpoint: 0.0.0.0:14250
tls:
cert_file: /var/run/tls/receiver/tls.crt
key_file: /var/run/tls/receiver/tls.key
min_version: ""
zipkin:
endpoint: 0.0.0.0:9411
tls:
cert_file: /var/run/tls/receiver/tls.crt
key_file: /var/run/tls/receiver/tls.key
min_version: ""
otlp:
protocols:
grpc:
endpoint: 0.0.0.0:4317
tls:
cert_file: /var/run/tls/receiver/tls.crt
key_file: /var/run/tls/receiver/tls.key
min_version: ""
http:
endpoint: 0.0.0.0:4318
tls:
cert_file: /var/run/tls/receiver/tls.crt
key_file: /var/run/tls/receiver/tls.key
min_version: ""
ring:
kvstore:
store: memberlist
ingester:
lifecycler:
ring:
kvstore:
store: memberlist
replication_factor: 1
tokens_file_path: /var/tempo/tokens.json
max_block_duration: 10m
memberlist:
abort_if_cluster_join_fails: false
join_members:
- tempo-simplest-gossip-ring
multitenancy_enabled: false
querier:
max_concurrent_queries: 20
frontend_worker:
frontend_address: tempo-simplest-query-frontend-discovery:9095
grpc_client_config:
tls_enabled: true
tls_cert_path: /var/run/tls/server/tls.crt
tls_key_path: /var/run/tls/server/tls.key
tls_ca_path: /var/run/ca/service-ca.crt
tls_server_name: tempo-simplest-query-frontend.chainsaw-tls-singletenant.svc.cluster.local
tls_min_version: VersionTLS13
search:
external_hedge_requests_at: 8s
external_hedge_requests_up_to: 2
server:
grpc_server_max_recv_msg_size: 4194304
grpc_server_max_send_msg_size: 4194304
http_listen_port: 3200
http_server_read_timeout: 30s
http_server_write_timeout: 30s
log_format: logfmt
tls_min_version: VersionTLS13
grpc_tls_config:
cert_file: /var/run/tls/server/tls.crt
key_file: /var/run/tls/server/tls.key
client_ca_file: /var/run/ca/service-ca.crt
client_auth_type: RequireAndVerifyClientCert
storage:
trace:
backend: s3
blocklist_poll: 5m
cache: none
s3:
endpoint: minio:9000
bucket: tempo
insecure: true
local:
path: /var/tempo/traces
wal:
path: /var/tempo/wal
usage_report:
reporting_enabled: false
query_frontend:
search:
max_spans_per_span_set: 0
concurrent_jobs: 2000
max_duration: 0s
default_result_limit: 20
ingester_client:
grpc_client_config:
tls_enabled: true
tls_cert_path: /var/run/tls/server/tls.crt
tls_key_path: /var/run/tls/server/tls.key
tls_ca_path: /var/run/ca/service-ca.crt
tls_server_name: tempo-simplest-ingester.chainsaw-tls-singletenant.svc.cluster.local
tls_insecure_skip_verify: false
tls_min_version: VersionTLS13
tempo-query.yaml: |
address: 0.0.0.0:7777
backend: localhost:3200
tenant_header_key: x-scope-orgid
services_query_duration: 72h0m0s
find_traces_concurrent_requests: 2
tempo.yaml: "compactor:\n compaction:\n block_retention: 48h0m0s\n ring:\n
\ kvstore:\n store: memberlist\ndistributor:\n receivers:\n jaeger:\n
\ protocols:\n thrift_http:\n endpoint: 0.0.0.0:14268\n tls:\n
\ cert_file: /var/run/tls/receiver/tls.crt\n key_file: /var/run/tls/receiver/tls.key\n
\ min_version: \n thrift_binary:\n endpoint: 0.0.0.0:6832\n
\ thrift_compact:\n endpoint: 0.0.0.0:6831\n grpc:\n endpoint:
0.0.0.0:14250\n tls:\n cert_file: /var/run/tls/receiver/tls.crt\n
\ key_file: /var/run/tls/receiver/tls.key\n min_version:
\n zipkin:\n tls:\n cert_file: /var/run/tls/receiver/tls.crt\n
\ key_file: /var/run/tls/receiver/tls.key\n min_version: \n otlp:\n
\ protocols:\n grpc:\n endpoint: 0.0.0.0:4317\n tls:\n
\ cert_file: /var/run/tls/receiver/tls.crt\n key_file: /var/run/tls/receiver/tls.key\n
\ min_version: \n http:\n endpoint: 0.0.0.0:4318\n tls:\n
\ cert_file: /var/run/tls/receiver/tls.crt\n key_file: /var/run/tls/receiver/tls.key\n
\ min_version: \n ring:\n kvstore:\n store: memberlist\ningester:\n
\ lifecycler:\n ring:\n kvstore:\n store: memberlist\n replication_factor:
1\n tokens_file_path: /var/tempo/tokens.json\n max_block_duration: 10m\nmemberlist:\n
\ abort_if_cluster_join_fails: false\n join_members:\n - tempo-simplest-gossip-ring\nmultitenancy_enabled:
false\nquerier:\n max_concurrent_queries: 20\n frontend_worker:\n frontend_address:
tempo-simplest-query-frontend-discovery:9095\n grpc_client_config:\n tls_enabled:
true\n tls_cert_path: /var/run/tls/server/tls.crt\n tls_key_path: /var/run/tls/server/tls.key\n
\ tls_ca_path: /var/run/ca/service-ca.crt\n tls_server_name: tempo-simplest-query-frontend.chainsaw-tls-singletenant.svc.cluster.local\n
\ tls_min_version: VersionTLS13\n search:\n external_hedge_requests_at:
8s\n external_hedge_requests_up_to: 2\ninternal_server:\n enable: true\n http_listen_address:
\"\"\n tls_min_version: VersionTLS13\n http_tls_config:\n cert_file: /var/run/tls/server/tls.crt\n
\ key_file: /var/run/tls/server/tls.key\nserver:\n grpc_server_max_recv_msg_size:
4194304\n grpc_server_max_send_msg_size: 4194304\n http_listen_port: 3200\n
\ http_server_read_timeout: 30s\n http_server_write_timeout: 30s\n log_format:
logfmt\n tls_min_version: VersionTLS13\n grpc_tls_config:\n cert_file: /var/run/tls/server/tls.crt\n
\ key_file: /var/run/tls/server/tls.key\n client_ca_file: /var/run/ca/service-ca.crt\n
\ client_auth_type: RequireAndVerifyClientCert\n http_tls_config:\n cert_file:
\ /var/run/tls/server/tls.crt\n client_auth_type: RequireAndVerifyClientCert\n
\ key_file: /var/run/tls/server/tls.key\n client_ca_file: /var/run/ca/service-ca.crt\nstorage:\n
\ trace:\n backend: s3\n blocklist_poll: 5m\n cache: none\n s3:\n
\ endpoint: minio:9000\n bucket: tempo\n insecure: true\n local:\n
\ path: /var/tempo/traces\n wal:\n path: /var/tempo/wal\nusage_report:\n
\ reporting_enabled: false\nquery_frontend:\n search:\n concurrent_jobs: 2000\n
\ max_duration: 0s\n default_result_limit: 20\ningester_client:\n grpc_client_config:\n
\ tls_enabled: true\n tls_cert_path: /var/run/tls/server/tls.crt\n tls_key_path:
/var/run/tls/server/tls.key\n tls_ca_path: /var/run/ca/service-ca.crt\n tls_server_name:
tempo-simplest-ingester.chainsaw-tls-singletenant.svc.cluster.local\n tls_insecure_skip_verify:
false\n tls_min_version: VersionTLS13\n"
tempo.yaml: |
compactor:
compaction:
block_retention: 48h0m0s
ring:
kvstore:
store: memberlist
distributor:
receivers:
jaeger:
protocols:
thrift_http:
endpoint: 0.0.0.0:14268
tls:
cert_file: /var/run/tls/receiver/tls.crt
key_file: /var/run/tls/receiver/tls.key
min_version: ""
thrift_binary:
endpoint: 0.0.0.0:6832
thrift_compact:
endpoint: 0.0.0.0:6831
grpc:
endpoint: 0.0.0.0:14250
tls:
cert_file: /var/run/tls/receiver/tls.crt
key_file: /var/run/tls/receiver/tls.key
min_version: ""
zipkin:
endpoint: 0.0.0.0:9411
tls:
cert_file: /var/run/tls/receiver/tls.crt
key_file: /var/run/tls/receiver/tls.key
min_version: ""
otlp:
protocols:
grpc:
endpoint: 0.0.0.0:4317
tls:
cert_file: /var/run/tls/receiver/tls.crt
key_file: /var/run/tls/receiver/tls.key
min_version: ""
http:
endpoint: 0.0.0.0:4318
tls:
cert_file: /var/run/tls/receiver/tls.crt
key_file: /var/run/tls/receiver/tls.key
min_version: ""
ring:
kvstore:
store: memberlist
ingester:
lifecycler:
ring:
kvstore:
store: memberlist
replication_factor: 1
tokens_file_path: /var/tempo/tokens.json
max_block_duration: 10m
memberlist:
abort_if_cluster_join_fails: false
join_members:
- tempo-simplest-gossip-ring
multitenancy_enabled: false
querier:
max_concurrent_queries: 20
frontend_worker:
frontend_address: tempo-simplest-query-frontend-discovery:9095
grpc_client_config:
tls_enabled: true
tls_cert_path: /var/run/tls/server/tls.crt
tls_key_path: /var/run/tls/server/tls.key
tls_ca_path: /var/run/ca/service-ca.crt
tls_server_name: tempo-simplest-query-frontend.chainsaw-tls-singletenant.svc.cluster.local
tls_min_version: VersionTLS13
search:
external_hedge_requests_at: 8s
external_hedge_requests_up_to: 2
internal_server:
enable: true
http_listen_address: ""
tls_min_version: VersionTLS13
http_tls_config:
cert_file: /var/run/tls/server/tls.crt
key_file: /var/run/tls/server/tls.key
server:
grpc_server_max_recv_msg_size: 4194304
grpc_server_max_send_msg_size: 4194304
http_listen_port: 3200
http_server_read_timeout: 30s
http_server_write_timeout: 30s
log_format: logfmt
tls_min_version: VersionTLS13
grpc_tls_config:
cert_file: /var/run/tls/server/tls.crt
key_file: /var/run/tls/server/tls.key
client_ca_file: /var/run/ca/service-ca.crt
client_auth_type: RequireAndVerifyClientCert
http_tls_config:
cert_file: /var/run/tls/server/tls.crt
client_auth_type: RequireAndVerifyClientCert
key_file: /var/run/tls/server/tls.key
client_ca_file: /var/run/ca/service-ca.crt
storage:
trace:
backend: s3
blocklist_poll: 5m
cache: none
s3:
endpoint: minio:9000
bucket: tempo
insecure: true
local:
path: /var/tempo/traces
wal:
path: /var/tempo/wal
usage_report:
reporting_enabled: false
query_frontend:
search:
max_spans_per_span_set: 0
concurrent_jobs: 2000
max_duration: 0s
default_result_limit: 20
ingester_client:
grpc_client_config:
tls_enabled: true
tls_cert_path: /var/run/tls/server/tls.crt
tls_key_path: /var/run/tls/server/tls.key
tls_ca_path: /var/run/ca/service-ca.crt
tls_server_name: tempo-simplest-ingester.chainsaw-tls-singletenant.svc.cluster.local
tls_insecure_skip_verify: false
tls_min_version: VersionTLS13
kind: ConfigMap
metadata:
labels:
Expand Down