Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Fix tracing properties in docker compose #5946

Merged
merged 2 commits into from
Sep 23, 2024

Conversation

onobc
Copy link
Contributor

@onobc onobc commented Sep 20, 2024

This commit adds the global tracing property
'management.tracing.enabled' to the Zipkin and Wavefront docker compose files.

Also, the Wavefront docker compose file excludes the Zipkin tracing auto-configuration and the Zipkin docker compose file excludes the Wavefront tracing auto-configuration.

This commit adds the global tracing property
'management.tracing.enabled' to the Zipkin and Wavefront docker compose
files.

Also, the Wavefront docker compose file excludes the Zipkin tracing
auto-configuration and the Zipkin docker compose file excludes the
Wavefront tracing auto-configuration.
@onobc onobc added this to the 3.0.x milestone Sep 20, 2024
@ilayaperumalg
Copy link
Contributor

LGTM

Copy link
Contributor

@cppwfs cppwfs left a comment

Choose a reason for hiding this comment

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

Great work on this!!!!!!! One question and 2 annoying nitpicks.

- SPRING_CLOUD_DATAFLOW_APPLICATIONPROPERTIES_STREAM_MANAGEMENT_TRACING_ENABLED=true
- SPRING_CLOUD_DATAFLOW_APPLICATIONPROPERTIES_STREAM_MANAGEMENT_TRACING_SAMPLING_PROBABILITY=1.0
- SPRING_CLOUD_DATAFLOW_APPLICATIONPROPERTIES_STREAM_MANAGEMENT_WAVEFRONT_TRACING_EXPORT_ENABLED=true
- SPRING_CLOUD_DATAFLOW_APPLICATIONPROPERTIES_STREAM_SPRING_AUTOCONFIGURE_EXCLUDE=org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinAutoConfiguration
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need to add this exclude for the skipper-server?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nope, dataflow replicates these common properties to the apps prior to handing off to skipper (see

* spring.cloud.dataflow.applicationProperties.stream.* and spring.cloud.dataflow.applicationProperties.task.* as well.
)

src/docker-compose/docker-compose-wavefront.yml Outdated Show resolved Hide resolved
src/docker-compose/docker-compose-wavefront.yml Outdated Show resolved Hide resolved
Copy link
Contributor

@cppwfs cppwfs left a comment

Choose a reason for hiding this comment

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

Sorry I clicked approve instead of Request changes. This is for the question.

Copy link
Contributor

@cppwfs cppwfs left a comment

Choose a reason for hiding this comment

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

pfft :-D

LGTM thanks for digging into this!!!!!

@onobc onobc merged commit 76058d3 into spring-cloud:main-3 Sep 23, 2024
2 of 3 checks passed
@onobc onobc deleted the fix-tracing-props branch September 23, 2024 19:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants