Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[hotrod] Fix connectivity in docker compose #5734

Merged
merged 3 commits into from
Jul 12, 2024

Conversation

yurishkuro
Copy link
Member

@yurishkuro yurishkuro commented Jul 12, 2024

Which problem is this PR solving?

  • HotROD demo stopped working. Since v0.105 the OTEL Collector components default hostname to localhost. However, that does not work inside a Docker container (at least on MacOS & Docker Desktop).

Description of the changes

  • Make OTLP receivers listen on all IPs (0.0.0.0)
  • Unrelated, but added a mermaid diagram for SPM, as I needed it for the slides for a presentation

How was this change tested?

  • Go through HotROD demo workflow

Signed-off-by: Yuri Shkuro <github@ysh.us>
@yurishkuro yurishkuro requested a review from a team as a code owner July 12, 2024 03:21
@yurishkuro yurishkuro requested a review from albertteoh July 12, 2024 03:21
@dosubot dosubot bot added the docker Pull requests that update Docker code label Jul 12, 2024
Copy link
Member

@FlamingSaint FlamingSaint left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

Signed-off-by: Yuri Shkuro <github@ysh.us>
Copy link

codecov bot commented Jul 12, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.84%. Comparing base (7a158cb) to head (12841c3).

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #5734   +/-   ##
=======================================
  Coverage   96.84%   96.84%           
=======================================
  Files         335      335           
  Lines       16155    16155           
=======================================
  Hits        15645    15645           
  Misses        340      340           
  Partials      170      170           
Flag Coverage Δ
badger_v1 8.06% <ø> (ø)
badger_v2 1.90% <ø> (ø)
cassandra-3.x-v1 16.62% <ø> (ø)
cassandra-3.x-v2 1.82% <ø> (ø)
cassandra-4.x-v1 16.62% <ø> (ø)
cassandra-4.x-v2 1.82% <ø> (ø)
elasticsearch-6.x-v1 18.80% <ø> (ø)
elasticsearch-7.x-v1 18.86% <ø> (ø)
elasticsearch-8.x-v1 19.05% <ø> (+0.01%) ⬆️
elasticsearch-8.x-v2 1.90% <ø> (+0.01%) ⬆️
grpc_v1 9.46% <ø> (ø)
grpc_v2 7.41% <ø> (ø)
kafka 9.75% <ø> (ø)
opensearch-1.x-v1 18.91% <ø> (+0.01%) ⬆️
opensearch-2.x-v1 18.90% <ø> (-0.02%) ⬇️
opensearch-2.x-v2 1.90% <ø> (ø)
unittests 95.23% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@yurishkuro yurishkuro merged commit c6d7e17 into jaegertracing:main Jul 12, 2024
42 checks passed
@yurishkuro yurishkuro deleted the fix-docker-compose branch July 12, 2024 04:15
yurishkuro added a commit that referenced this pull request Jul 13, 2024
## Which problem is this PR solving?
- Resolves #5737

## Description of the changes
- Revert #5734
- Default OTLP receiver endpoints to `:port` instead of relying on OTEL
Collector defaults
- Clean up tests to use ephemeral ports when possible

## How was this change tested?
- Tested similar to #5734 by using `COLLECTOR_OTLP_HTTP_HOST_PORT=:4318`

---------

Signed-off-by: Yuri Shkuro <github@ysh.us>
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
changelog:bugfix-or-minor-feature docker Pull requests that update Docker code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants