[Enhancement] Hotrod and Monitor Use Docker Compose V2 as Default #6523
+16
−16
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zzzk1
force-pushed
the
docker-compose-v2
branch
from
1ad5347 to
e9b8615
Compare
Signed-off-by: zzzk1 <[email protected]>
zzzk1
force-pushed
the
docker-compose-v2
branch
from
e9b8615 to
ff0faea
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #6523 +/- ##
==========================================
+ Coverage 96.27% 96.29% +0.01%
==========================================
Files 372 372
Lines 21283 21283
==========================================
+ Hits 20491 20494 +3
+ Misses 605 603 -2
+ Partials 187 186 -1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
yurishkuro
reviewed
Jan 11, 2025
| @@ -20,7 +20,7 @@ build: clean-jaeger | |||
| .PHONY: dev | |||
| dev: export JAEGER_IMAGE_TAG = dev | |||
| dev: | |||
| docker compose -f docker-compose.yml up $(DOCKER_COMPOSE_ARGS) | |||
| docker compose -f docker-compose-v1.yml up $(DOCKER_COMPOSE_ARGS) | |||
|
|
|||
| .PHONY: dev-v2 | |||
There was a problem hiding this comment.
Can we change the target names accordingly? And the readme.
| @@ -69,7 +69,7 @@ This brings up the system necessary to use the SPM feature locally. | |||
| It uses the latest image tags from both Jaeger and OpenTelemetry. | |||
|
|
|||
| ```shell | |||
| docker compose up | |||
| docker compose -f docker-compose-v1.yml up | |||
There was a problem hiding this comment.
Let's turn this around and emphasize v2 first, with a note for v1
| @@ -83,7 +83,7 @@ docker compose -f docker-compose-v2.yml up | |||
| - Navigate to Jaeger UI at http://localhost:16686/ and inspect the Monitor tab. Select `redis` service from the dropdown to see more than one endpoint. | |||
| - To visualize the raw metrics stored on the Prometheus server (for debugging and local development use cases), use the built-in Prometheus UI at http://localhost:9090/query. For example, http://localhost:9090/query?g0.expr=traces_span_metrics_calls_total&g0.tab=0&g0.range_input=5m | |||
|
|
|||
| **Warning:** The included [docker-compose.yml](./docker-compose.yml) file uses the `latest` version of Jaeger and other components. If your local Docker registry already contains older versions, which may still be tagged as `latest`, you may want to delete those images before running the full set, to ensure consistent behavior: | |||
| **Warning:** The included [docker-compose-v1.yml](./docker-compose-v1.yml) file uses the `latest` version of Jaeger and other components. If your local Docker registry already contains older versions, which may still be tagged as `latest`, you may want to delete those images before running the full set, to ensure consistent behavior: | |||
There was a problem hiding this comment.
Suggested change
| **Warning:** The included [docker-compose-v1.yml](./docker-compose-v1.yml) file uses the `latest` version of Jaeger and other components. If your local Docker registry already contains older versions, which may still be tagged as `latest`, you may want to delete those images before running the full set, to ensure consistent behavior: | |
| **Warning:** The included ` docker compose` files use the `latest` version of Jaeger and other components. If your local Docker registry already contains older versions, which may still be tagged as `latest`, you may want to delete those images before running the full set, to ensure consistent behavior: |
| @@ -126,7 +126,7 @@ to emit traces to the OpenTelemetry Collector which, in turn, will aggregate the | |||
|
|
|||
| Start the local stack needed for SPM, if not already done: | |||
| ```shell | |||
| docker compose up | |||
| docker compose -f docker-compose-v2.yml up | |||
There was a problem hiding this comment.
The v2 files need to be renamed just docker-compose, so that the user is not required to specify them on the command line.
| @@ -23,7 +23,7 @@ As of Jaeger v1.42.0 this application was upgraded to use the OpenTelemetry SDK | |||
|
|
|||
| ### Run everything via `docker compose` | |||
|
|
|||
| * Download `docker-compose.yml` from https://github.com/jaegertracing/jaeger/blob/main/examples/hotrod/docker-compose.yml | |||
| * Download `docker-compose-v1.yml` from https://github.com/jaegertracing/jaeger/blob/main/examples/hotrod/docker-compose-v1.yml | |||
There was a problem hiding this comment.
Emphasize v2 versions in the docs, not v1
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Which problem is this PR solving?
Description of the changes
How was this change tested?
Checklist
jaeger:make lint testjaeger-ui:npm run lintandnpm run test