24 Commits
Author SHA1 Message Date
Stéphane Nicoll 6bdd6ce8b6 Start building against Micrometer Tracing 1.8.0-M2 snapshots
See gh-51777
2026-09-16 15:22:24 +02:00
Stéphane Nicoll 72524bcb9e Start building against Micrometer 1.18.0-M2 snapshots
See gh-51776
2026-09-16 15:22:23 +02:00
Moritz Halbritter 3f7cebd802 Polish "Allow configuring Micrometer Tracing MDC keys"
Derive logging.pattern.correlation from the configured MDC keys so that
log correlation keeps working when the keys are customized, instead of
silently rendering a blank correlation field.

Reject empty MDC keys and only clear Brave's default correlation fields
when the keys have been customized, so that applications using the
defaults are unaffected if Brave adds a default field.

Replace the tests that asserted on bean wiring with integration tests
covering the MDC contents, plus a smoke test for the log output.

See gh-50595
2026-08-25 13:54:00 +02:00
Phil Clay dc2274e5b6 Allow configuring Micrometer Tracing MDC keys
See gh-50595

Signed-off-by: Phil Clay <philsttr@users.noreply.github.com>
2026-08-25 13:51:28 +02:00
Jonatan IvanovandStéphane Nicoll 188860f730 Adapt to changes in micrometer snapshots
See https://github.com/micrometer-metrics/micrometer/issues/2297

Co-authored-by: Stéphane Nicoll <stephane.nicoll@broadcom.com>
2026-08-14 08:16:26 +02:00
Stéphane Nicoll 02b3242057 Merge branch '4.0.x'
Closes gh-50943
2026-07-14 11:38:01 +02:00
Yanming Zhou 7522f679fd Inject Customizers as ObjectProvider to keep consistency
See gh-50909

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2026-07-14 11:23:34 +02:00
Andy Wilkinson 6a74bb85a3 Merge branch '4.0.x'
Closes gh-50440
2026-05-14 15:03:44 +01:00
Andy Wilkinson add52b6ccd Merge branch '3.5.x' into 4.0.x
Closes gh-50439
2026-05-14 15:02:24 +01:00
Moritz Halbritter da63bf6085 Don't register SpanContext if exemplars include is 'none'
See gh-49572
2026-03-16 10:31:46 +01:00
Moritz Halbritter 538e02b5ef Don't register ExemplarContextProvider if exemplars include is 'none'
See gh-49572
2026-03-16 09:32:53 +01:00
Andy Wilkinson 79ef955563 Merge branch '4.0.x'
Closes gh-49599
2026-03-13 16:48:23 +00:00
Andy Wilkinson 76290f7871 Remove unused org.springframework.boot.docker-test plugin
Closes gh-49598
2026-03-13 16:38:01 +00:00
Moritz Halbritter efd44dce56 Rename management.tracing.exemplars.filter to management.tracing.exemplars.include
See gh-49572
2026-03-13 15:07:11 +01:00
Moritz Halbritter 5ca8e0956a Add more fine-grained support for selecting metric exemplars
Closes gh-49572
2026-03-12 11:58:05 +01:00
Moritz Halbritter 2a8ad44cef Polish "Add auto-configuration for otlp exemplars"
See gh-49538
2026-03-11 09:11:09 +01:00
Jonatan Ivanov d4521bb91b Add auto-configuration for otlp exemplars
See gh-49538
2026-03-11 08:48:52 +01:00
Moritz Halbritter cdf8d2e9c8 Back off on Propagator in Brave and Otel auto-configurations
This also fixes the bug that both auto-configurations couldn't be used
together.

Closes gh-49183
2026-02-13 13:48:38 +01:00
Phillip Webb a4f35688aa Merge branch '3.5.x' into 4.0.x 2026-01-06 12:54:11 -08:00
Stéphane Nicoll 3d23261f87 Merge branch '3.5.x'
Closes gh-48122
2025-11-13 14:55:19 +01:00
Stéphane Nicoll d1e5fe3248 Merge branch '3.5.x'
Closes gh-48106
2025-11-13 10:31:25 +01:00
Moritz Halbritter ab405a3321 Add missing configuration metadata deprecations and replacements 2025-11-06 09:11:41 +01:00
Moritz Halbritter 4866f1a395 Switch property backing OnEnabledTracingExportCondition
It's now management.tracing.export.{name}.enabled

Closes gh-47959
2025-11-05 13:52:25 +01:00
Moritz Halbritter e9172d9f51 Split spring-boot-micrometer-tracing into Brave and OpenTelemetry specific module
Closes gh-47953
2025-11-05 12:14:13 +01:00