Use jaeger-v2 by default in Hotrod and Monitor examples #6523
+96
−96
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
2 times, most recently
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.23% 96.21% -0.03%
==========================================
Files 372 372
Lines 21360 21360
==========================================
- Hits 20556 20551 -5
- Misses 612 616 +4
- Partials 192 193 +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
docker-compose/monitor/Makefile
Outdated
| @@ -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.
There was a problem hiding this comment.
I updated the document and make v2 as the default in the Makefile.
There was a problem hiding this comment.
then this target needs to be renamed dev-v1
docker-compose/monitor/README.md
Outdated
| @@ -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.
zzzk1
force-pushed
the
docker-compose-v2
branch
from
8546cb9 to
9327ead
Compare
Signed-off-by: zzzk1 <[email protected]>
zzzk1
force-pushed
the
docker-compose-v2
branch
from
9327ead to
fb8b9e4
Compare
Signed-off-by: zzzk1 <[email protected]>
zzzk1
force-pushed
the
docker-compose-v2
branch
from
fb8b9e4 to
80c02ab
Compare
yurishkuro
reviewed
Jan 13, 2025
docker-compose/monitor/Makefile
Outdated
| @@ -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.
then this target needs to be renamed dev-v1
Signed-off-by: zzzk1 <[email protected]>
yurishkuro
approved these changes
Jan 13, 2025
yurishkuro
changed the title
jyoungs
added a commit
to jyoungs/jaeger
that referenced
this pull request
Jan 13, 2025
These links are currently broken. I didn't actually test these commands, but jaegertracing#6523 looks like a simple rename, so might be fine. Signed-off-by: Jeff Youngs <[email protected]>
4 tasks
yurishkuro
pushed a commit
that referenced
this pull request
Jan 13, 2025
These links are currently broken. I didn't actually test these commands, but #6523 looks like a simple rename, so might be fine. ## Which problem is this PR solving? - n/a ## Description of the changes - README updates ## How was this change tested? - It wasn't ## Checklist - [ ] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [ ] I have signed all commits - [ ] I have added unit tests for the new functionality - [ ] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `npm run lint` and `npm run test` Signed-off-by: Jeff Youngs <[email protected]>
ekefan
pushed a commit
to ekefan/jaeger
that referenced
this pull request
Jan 14, 2025
…g#6523) <!-- !! Please DELETE this comment before posting. We appreciate your contribution to the Jaeger project! 👋🎉 --> ## Which problem is this PR solving? - Resolves jaegertracing#6520 ## Description of the changes - Rename docker-compose.yml to docker-compose-v1.yml - update reference: script, doc, github actions, makefile ## How was this change tested? - ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [ ] I have added unit tests for the new functionality - [x] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `npm run lint` and `npm run test` --------- Signed-off-by: zzzk1 <[email protected]> Co-authored-by: Yuri Shkuro <[email protected]>
ekefan
pushed a commit
to ekefan/jaeger
that referenced
this pull request
Jan 14, 2025
These links are currently broken. I didn't actually test these commands, but jaegertracing#6523 looks like a simple rename, so might be fine. ## Which problem is this PR solving? - n/a ## Description of the changes - README updates ## How was this change tested? - It wasn't ## Checklist - [ ] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [ ] I have signed all commits - [ ] I have added unit tests for the new functionality - [ ] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `npm run lint` and `npm run test` Signed-off-by: Jeff Youngs <[email protected]>
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