Skip to content

Commit 93c79ff

Browse files
committed
Enable overriding some Tempo paths
This enables the use of devenv.sh as well (given a config file).
1 parent 60868e4 commit 93c79ff

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

.docker/otel/tempo.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,7 @@ distributor:
1111
storage:
1212
trace:
1313
backend: local
14+
wal:
15+
path: ${TEMPO_WAL_PATH:-/tmp/tempo/wal}
1416
local:
15-
path: /tmp/tempo/traces
17+
path: ${TEMPO_TRACES_PATH:-/tmp/tempo/traces}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ This will automatically provision the databases 'blurts' and 'test-blurts', and
8484
2. Start docker containers (this will stand up all services defined, including pubsub)
8585

8686
```sh
87-
docker compose --env-file .env.local up -d
87+
docker compose --env-file .env.local up --detach
8888
```
8989

9090
3. To tear down (this will delete stored data):

docker-compose.yml

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

5656
tempo:
5757
image: grafana/tempo:2.4.1
58-
command: ["-config.file=/etc/tempo.yaml"]
58+
command: ["-config.file=/etc/tempo.yaml", "-config.expand-env=true"]
5959
volumes:
6060
- ./.docker/otel/tempo.yaml:/etc/tempo.yaml:ro
6161
ports:

next-env.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/// <reference types="next" />
22
/// <reference types="next/image-types/global" />
3-
import "./.next/types/routes.d.ts";
3+
import "./.next/dev/types/routes.d.ts";
44

55
// NOTE: This file should not be edited
66
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

0 commit comments

Comments
 (0)