Skip to content

Commit d8577c7

Browse files
committed
Update sqlx-oldapi and telemetry example
1 parent 2c89bd0 commit d8577c7

4 files changed

Lines changed: 13 additions & 50 deletions

File tree

Cargo.lock

Lines changed: 11 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ panic = "abort"
1818
codegen-units = 2
1919

2020
[dependencies]
21-
sqlx = { package = "sqlx-oldapi", version = "0.6.55", default-features = false, features = [
21+
sqlx = { package = "sqlx-oldapi", version = "0.6.56", default-features = false, features = [
2222
"any",
2323
"runtime-tokio-rustls",
2424
"migrate",

examples/telemetry/docker-compose.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ services:
119119
postgres:
120120
condition: service_started
121121
loki:
122-
condition: service_healthy
122+
condition: service_started
123123

124124
prometheus:
125125
image: prom/prometheus:v3.2.1
@@ -139,11 +139,6 @@ services:
139139
loki:
140140
image: grafana/loki:3.7.2
141141
command: ["-config.file=/etc/loki/local-config.yaml"]
142-
healthcheck:
143-
test: ["CMD-SHELL", "wget -q -O- http://127.0.0.1:3100/ready >/dev/null 2>&1"]
144-
interval: 2s
145-
timeout: 5s
146-
retries: 20
147142

148143
grafana:
149144
image: grafana/grafana:latest

examples/telemetry/tempo.yaml

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -10,39 +10,6 @@ distributor:
1010
grpc:
1111
endpoint: 0.0.0.0:4317
1212

13-
ingester:
14-
max_block_duration: 5m
15-
16-
compactor:
17-
compaction:
18-
block_retention: 1h
19-
20-
metrics_generator:
21-
ring:
22-
kvstore:
23-
store: inmemory
24-
registry:
25-
external_labels:
26-
source: tempo
27-
cluster: docker-compose
28-
processor:
29-
service_graphs: {}
30-
span_metrics: {}
31-
local_blocks:
32-
flush_to_storage: true
33-
storage:
34-
path: /tmp/tempo/generator/wal
35-
traces_storage:
36-
path: /tmp/tempo/generator/traces
37-
38-
overrides:
39-
defaults:
40-
metrics_generator:
41-
processors:
42-
- service-graphs
43-
- span-metrics
44-
- local-blocks
45-
4613
storage:
4714
trace:
4815
backend: local

0 commit comments

Comments
 (0)