Skip to content

Commit

Permalink
[refactor] Move SPM v2 config to cmd/jaeger/ with all other configs (#…
Browse files Browse the repository at this point in the history
…6256)

## Which problem is this PR solving?
- This config was demonstrating a setup with span metrics processor, but
was stashed in example directory

## Description of the changes
- Move the config to /cmd/jaeger/ where all other v2 configs are

## How was this change tested?
- ran SPM locally
- CI

## Follow-ups
* [ ] check if SPM documentation points to the old location of the
config

---------

Signed-off-by: Yuri Shkuro <[email protected]>
  • Loading branch information
yurishkuro authored Nov 26, 2024
1 parent b2e84b4 commit 600d82c
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ service:
receivers: [spanmetrics]
exporters: [prometheus]
telemetry:
resource:
service.name: jaeger
metrics:
level: detailed
address: 0.0.0.0:8888
logs:
level: DEBUG

Expand Down
2 changes: 1 addition & 1 deletion docker-compose/monitor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ JAEGER_IMAGE_TAG=1.62.0 docker compose up
or for Jaeger v2:

```shell
JAEGER_IMAGE_TAG=2.0.0-rc2 docker compose -f docker-compose-v2.yml up
JAEGER_IMAGE_TAG=2.0.0 docker compose -f docker-compose-v2.yml up
```

## Development
Expand Down
5 changes: 4 additions & 1 deletion docker-compose/monitor/docker-compose-v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@ services:
image: jaegertracing/jaeger:${JAEGER_IMAGE_TAG:-latest}
volumes:
- "./jaeger-ui.json:/etc/jaeger/jaeger-ui.json" # Do we need this for v2 ? Seems to be running without this.
- "./jaeger-v2-config.yml:/etc/jaeger/config.yml"
- "../../cmd/jaeger/config-spm.yaml:/etc/jaeger/config.yml"
command: ["--config", "/etc/jaeger/config.yml"]
ports:
- "16686:16686"
- "8888:8888"
- "8889:8889"
- "4317:4317"
- "4318:4318"

microsim:
networks:
Expand Down

0 comments on commit 600d82c

Please sign in to comment.