Commit Graph

2168 Commits

Author SHA1 Message Date
Andy Wilkinson
0f110a5f5b Merge branch '3.1.x'
Closes gh-36557
2023-07-25 12:54:46 +01:00
Andy Wilkinson
22fa904590 Merge branch '3.0.x' into 3.1.x
Closes gh-36556
2023-07-25 12:54:34 +01:00
Andy Wilkinson
45624c0a78 Merge branch '2.7.x' into 3.0.x
Closes gh-36555
2023-07-25 12:53:11 +01:00
Andy Wilkinson
aae8665db1 Add missing management.metrics.export.wavefront properties
Closes gh-36498
2023-07-25 12:35:58 +01:00
Andy Wilkinson
346ebbc6f8 Merge branch '3.1.x'
Closes gh-36554
2023-07-25 12:09:22 +01:00
Andy Wilkinson
5d1b2348e8 Merge branch '3.0.x' into 3.1.x
Closes gh-36553
2023-07-25 12:08:43 +01:00
Andy Wilkinson
826bad5820 Merge branch '2.7.x' into 3.0.x
Closes gh-36552
2023-07-25 12:08:19 +01:00
Andy Wilkinson
a6c19dae07 Add missing management.metrics.export.signalfx properties
Closes gh-36497
2023-07-25 11:35:57 +01:00
Andy Wilkinson
c9c36e7e42 Merge branch '3.1.x'
Closes gh-36527
2023-07-24 14:38:52 +01:00
Andy Wilkinson
54323d1a95 Merge branch '3.0.x' into 3.1.x
Closes gh-36526
2023-07-24 14:35:14 +01:00
Andy Wilkinson
2db45e9ba3 Merge branch '2.7.x' into 3.0.x
Closes gh-36525
2023-07-24 14:34:50 +01:00
Andy Wilkinson
a5d5908c27 Add missing management.metrics.export.atlas properties
Closes gh-36496
2023-07-24 14:34:11 +01:00
Andy Wilkinson
3affb3342e Deprecate auto-configuration for InfluxDB
Closes gh-35190
2023-07-20 13:31:10 +01:00
Moritz Halbritter
54e99d68fa Auto-configure ObservationRegistry on ScheduledTaskRegistrar
The TaskSchedulingAutoConfiguration.taskScheduler auto-configuration now
no longer backs off on SchedulingConfigurer beans.

Closes gh-36119
2023-07-20 09:43:12 +02:00
kitbolourchi
abebc396c0 Change B3 extraction format to single
See gh-36061
2023-07-19 08:14:01 +02:00
Stephane Nicoll
c726a13395 Polish "Add auto-configuration for ObservedAspect"
See gh-35191
2023-07-17 16:06:08 +02:00
Vedran Pavic
0dae89e837 Add auto-configuration for ObservedAspect
This adds support for auto-configuring `ObservedAspect` when AspectJ is
on the classpath, which enables the usage of `@Observed`.

See gh-35191
2023-07-17 16:05:48 +02:00
Stephane Nicoll
31db1d8125 Merge branch '3.1.x'
Closes gh-36430
2023-07-17 15:48:41 +02:00
Stephane Nicoll
7195d87e6c Merge branch '3.0.x' into 3.1.x
Closes gh-36429
2023-07-17 15:48:30 +02:00
Stephane Nicoll
750096b9c2 Polish "Allow custom ExemplarSampler to be used"
See gh-35619
2023-07-17 15:46:48 +02:00
Johnny Goncalves
94b17ecd26 Allow custom ExemplarSampler to be used
See gh-35619
2023-07-17 15:44:05 +02:00
Stephane Nicoll
df8b73d8f7 Merge branch '3.1.x'
Closes gh-36425
2023-07-17 15:09:23 +02:00
Stephane Nicoll
588129318c Merge branch '3.0.x' into 3.1.x
Closes gh-36423
2023-07-17 15:06:00 +02:00
Jonatan Ivanov
58cfdbfa2d Add missing OTel Span attributes
OTel semantic conventions mandate certain resource attributes to present
on exported spans. This commits make sure that the attribute we add are
merged with the defaults, rather than replacing them.

See gh-36155
2023-07-17 15:00:51 +02:00
Jonatan Ivanov
8115f8f146 Add property for base time unit in OTLP registry
Micrometer added a new configuration option to its OTLP registry to
enable configuring the base time unit. These changes provide a
configuration property to support to it.

See gh-36393
2023-07-17 13:17:41 +02:00
Stephane Nicoll
783bfb62e2 Merge branch '3.1.x'
Closes gh-36420
2023-07-17 10:04:14 +02:00
Stephane Nicoll
d2912c6442 Update copyright year of changed files
See gh-36306
2023-07-17 09:40:57 +02:00
Christoph Dreis
8321887d6a Fix typos
See gh-36306
2023-07-17 09:40:16 +02:00
Andy Wilkinson
b8c4fb6b9a Upgrade to Liquibase 4.23.0
Closes gh-36377
2023-07-14 19:57:27 +01:00
Andy Wilkinson
8ed2ef5640 Merge branch '3.1.x'
Closes gh-36277
2023-07-07 12:07:25 +01:00
Andy Wilkinson
c4157bb515 Merge branch '3.0.x' into 3.1.x
Closes gh-36276
2023-07-07 12:07:07 +01:00
Andy Wilkinson
cc80bb78fe Merge branch '2.7.x' into 3.0.x
Closes gh-36275
2023-07-07 12:06:51 +01:00
Andy Wilkinson
52f732920b Support multiple health groups with an additional path with Jersey
This commit knowingly makes breaking API changes to
JerseyHealthEndpointAdditionalPathResourceFactory. We considered
other options but they all had the potential to be backwards
incompatible in one way or another. Faced with that situation we
concluded that the likelihood of anyone using the modified API
directly is small enough to warrant making the breaking changes.
If it becomes apparent that we have misjudged things we can revisit
the changes in the future.

Closes gh-36250
2023-07-07 11:21:56 +01:00
Johnny Lim
7c77e1bb85 Polish 'Log correlation IDs when Micrometer tracing is being used'
See gh-36158
2023-07-02 20:08:45 +01:00
Ahmed Ashour
298bfd96c2 Change WebServer log messages to use port or ports, not port(s)
See gh-36103
2023-06-30 16:28:21 +01:00
Moritz Halbritter
b4bc7cebbc Revert "Add property to specify the order of ServerHttpObservationFilter"
This reverts commit 7b90fbb0b2.
2023-06-30 14:01:27 +02:00
Moritz Halbritter
849f65a0de Revert "Apply filter order to ServerHttpObservationFilter"
This reverts commit efcc65bc5b.
2023-06-30 14:01:26 +02:00
Andy Wilkinson
b645eb32ac Remove deprecated code that was to be removed in 3.2
Closes gh-36034
2023-06-23 18:14:22 +01:00
Andy Wilkinson
357c67a999 Merge branch '3.1.x' 2023-06-23 15:58:51 +01:00
Andy Wilkinson
3f7fe25cb9 Merge branch '3.0.x' into 3.1.x
Closes gh-36044
2023-06-23 15:58:36 +01:00
Andy Wilkinson
2fae5de245 Merge branch '2.7.x' into 3.0.x
Closes gh-36043
2023-06-23 15:50:02 +01:00
Andy Wilkinson
d2966e1cbf Polish "Replace calls to verifyComplete() to avoid indefinite blocking"
See gh-35915
2023-06-23 12:38:12 +01:00
ThomazPassarelli
f9da30faf1 Replace calls to verifyComplete() to avoid indefinite blocking
See gh-35915
2023-06-23 12:16:26 +01:00
Jonatan Ivanov
c1b295fd71 Log correlation IDs when Micrometer tracing is being used
Add support for logging correlation IDs with Logback or Log4J2 whenever
Micrometer tracing is being used.

The `LoggingSystemProperties` class now accepts a defualt value resolver
which will be used whenever a value isn't in the environment. The
`AbstractLoggingSystem` provides a resolver that supports the
`logging.pattern.correlation` property and will return a value whenever
`LoggingSystem.EXPECT_CORRELATION_ID_PROPERTY` is set.

Using `LoggingSystem.EXPECT_CORRELATION_ID_PROPERTY` allows us to
provide a consistent width for the correlation ID, even when it's
missing from the MDC.

The exact correlation pattern returned will depend on the `LoggingSytem`
implementation. Currently Logback and Log4J2 are supported and both
make use of a custom converter which delegates to a new
`CorrelationIdFormatter` class.

Closes gh-33280
2023-06-22 00:28:45 -07:00
Phillip Webb
3a796aedea Merge branch '3.1.x' 2023-06-22 00:28:01 -07:00
Phillip Webb
31f218c4e0 Merge branch '3.0.x' into 3.1.x 2023-06-22 00:27:51 -07:00
Phillip Webb
9db3c5a2f7 Polish 2023-06-22 00:24:39 -07:00
Moritz Halbritter
f7abf926a9 Merge branch '3.1.x' 2023-06-19 21:04:26 +02:00
Moritz Halbritter
cbbbecce37 Merge branch '3.0.x' into 3.1.x 2023-06-19 21:04:09 +02:00
Moritz Halbritter
975e2d110c Polish CompositePropagationFactory
Remove shaded Guava import
2023-06-19 21:03:05 +02:00