Commit Graph

47721 Commits

Author SHA1 Message Date
Phillip Webb
9b0593efe3 Fallback to RandomAccessFile on ClosedByInterruptException
Refine the fix for gh-38611 so that `ClosedByInterruptException` no
longer retries in a loop.

Our previous fix was flawed due to the fact that another interrupt
could occur after we clear the first and whilst we are reading data.
If this happens 10 times in a row, we raise an exception and end up
causing NoClassDefFoundError errors.

Our new approach retains the use of `FileChannel` and a direct buffer
up to the point that a `ClosedByInterruptException` is raised or the
thread is detected as interrupted.  At that point, we temporarily
switch to using a `RandomAccessFile` to access the data. This will
block the thread until the data has been read.

Fixes gh-40096
2024-04-16 14:47:07 -07:00
Phillip Webb
4203e1f2fa Rename FileChannelDataBlock to FileDataBlock
Rename the internal `FileChannelDataBlock` to `FileDataBlock` since we
want to fallback to a `RandomAccessFile` when a thread is interrupted.

See gh-40096
2024-04-16 14:46:56 -07:00
Andy Wilkinson
778c528281 Upgrade to Spring Security 6.2.4
Closes gh-40217
2024-04-16 19:47:35 +01:00
Andy Wilkinson
bd825141b7 Upgrade to Spring Pulsar 1.0.5
Closes gh-40216
2024-04-16 19:47:34 +01:00
Andy Wilkinson
e731986d22 Upgrade to Spring LDAP 3.2.3
Closes gh-40215
2024-04-16 19:47:33 +01:00
Andy Wilkinson
2028d431cd Upgrade to Spring Kafka 3.1.4
Closes gh-40377
2024-04-16 19:47:32 +01:00
Andy Wilkinson
37e13bc7eb Upgrade to Spring HATEOAS 2.2.2
Closes gh-40376
2024-04-16 19:47:27 +01:00
Andy Wilkinson
94ec0130c5 Upgrade to Spring Framework 6.1.6
Closes gh-40213
2024-04-16 19:47:22 +01:00
Andy Wilkinson
00304fe5a7 Upgrade to Spring Data Bom 2023.1.5
Closes gh-40212
2024-04-16 19:47:21 +01:00
Andy Wilkinson
6dfcf44ffc Upgrade to Spring Authorization Server 1.2.4
Closes gh-40211
2024-04-16 19:47:20 +01:00
Andy Wilkinson
e91621cddf Upgrade to Spring AMQP 3.1.4
Closes gh-40210
2024-04-16 19:47:19 +01:00
Andy Wilkinson
c4aa91d290 Merge branch '3.1.x' into 3.2.x 2024-04-16 19:45:19 +01:00
Andy Wilkinson
594fa88ee0 Upgrade to Spring Security 6.1.9
Closes gh-40204
2024-04-16 19:44:42 +01:00
Andy Wilkinson
d5af9a41b9 Upgrade to Spring LDAP 3.1.5
Closes gh-40203
2024-04-16 19:44:42 +01:00
Andy Wilkinson
db7059c1f7 Upgrade to Spring Kafka 3.0.16
Closes gh-40375
2024-04-16 19:44:41 +01:00
Andy Wilkinson
bc79274f9e Upgrade to Spring Integration 6.1.8
Closes gh-40202
2024-04-16 19:44:36 +01:00
Andy Wilkinson
59325d1626 Upgrade to Spring HATEOAS 2.1.5
Closes gh-40374
2024-04-16 19:44:35 +01:00
Andy Wilkinson
475af1f3f8 Upgrade to Spring Framework 6.0.19
Closes gh-40201
2024-04-16 19:44:30 +01:00
Andy Wilkinson
5da05e2037 Upgrade to Spring Data Bom 2023.0.11
Closes gh-40200
2024-04-16 19:44:29 +01:00
Andy Wilkinson
2a1268c597 Upgrade to Spring Authorization Server 1.1.7
Closes gh-40199
2024-04-16 19:44:28 +01:00
Andy Wilkinson
acfc5fe830 Upgrade to Spring AMQP 3.0.13
Closes gh-40373
2024-04-16 19:44:27 +01:00
Andy Wilkinson
46b02aee82 Merge branch '3.1.x' into 3.2.x
Closes gh-40368
2024-04-16 13:10:54 +01:00
Andy Wilkinson
bf97f6ca3c Make Homebrew available to the release verification tests
Closes gh-40367
2024-04-16 13:10:26 +01:00
Moritz Halbritter
5058719242 Merge branch '3.1.x' into 3.2.x
Closes gh-40364
2024-04-16 13:40:03 +02:00
Moritz Halbritter
053c674302 Merge pull request #40035 from izeye
* pr/40035:
  Fix target in BindValidationFailureAnalyzer

Closes gh-40035
2024-04-16 13:39:12 +02:00
Johnny Lim
201885a242 Fix target in BindValidationFailureAnalyzer
See gh-40035
2024-04-16 11:55:09 +02:00
Andy Wilkinson
30c9ea8d8c Merge branch '3.1.x' into 3.2.x
Closes gh-40362
2024-04-16 09:34:25 +01:00
Andy Wilkinson
3b98056bb5 Merge pull request #40358 from dependabot[bot]
* gh-40358:
  Polish "Upgrade to gradle/actions 3.3.0"
  Upgrade to gradle/actions 3.3.0

Closes gh-40358
2024-04-16 09:33:59 +01:00
Andy Wilkinson
ece2c683c6 Polish "Upgrade to gradle/actions 3.3.0"
See gh-40358
2024-04-16 09:33:33 +01:00
dependabot[bot]
b3db9204d9 Upgrade to gradle/actions 3.3.0
Signed-off-by: dependabot[bot] <support@github.com>

See gh-40358
2024-04-16 09:27:27 +01:00
Andy Wilkinson
95a5bb60cc Merge branch '3.1.x' into 3.2.x 2024-04-15 17:16:11 +01:00
Andy Wilkinson
a4231abb0a Polish GHA input and output handling 2024-04-15 17:16:03 +01:00
Andy Wilkinson
b49a5adf78 Merge branch '3.1.x' into 3.2.x
See gh-40354
2024-04-15 15:49:17 +01:00
Andy Wilkinson
19714c9e08 Correct name of secret access key input
See gh-40353
2024-04-15 15:48:37 +01:00
Andy Wilkinson
19d8894f2d Merge branch '3.1.x' into 3.2.x
See gh-40354
2024-04-15 15:45:32 +01:00
Andy Wilkinson
0a2865132d Configure shell for all run steps
See gh-40353
2024-04-15 15:44:48 +01:00
Andy Wilkinson
afe05435f8 Merge branch '3.1.x' into 3.2.x
Closes gh-40354
2024-04-15 15:38:52 +01:00
Andy Wilkinson
e4802b880d Encapsulate common build steps in a composite action
Closes gh-40353
2024-04-15 15:36:36 +01:00
Andy Wilkinson
fe82097d71 Merge branch '3.1.x' into 3.2.x 2024-04-15 14:14:43 +01:00
Andy Wilkinson
590b1bded8 Correct reference to reusable workflow 2024-04-15 14:14:36 +01:00
Andy Wilkinson
519f779d09 Merge branch '3.1.x' into 3.2.x 2024-04-15 14:12:03 +01:00
Andy Wilkinson
e35cc60eff Polish 2024-04-15 14:11:55 +01:00
Andy Wilkinson
f763751574 Merge branch '3.1.x' into 3.2.x
Closes gh-40351
2024-04-15 14:09:21 +01:00
Andy Wilkinson
2c6006eeff Move verification into reusable workflow
Closes gh-40350
2024-04-15 13:32:07 +01:00
Andy Wilkinson
74fff36e82 Merge branch '3.1.x' into 3.2.x 2024-04-12 16:02:07 +01:00
Brian Clozel
24f80154d4 Do not overwrite attributes in ClientObservationConventionAdapter
Prior to this commit, the `ClientObservationConventionAdapter` would
overwrite a request builder attribute. This would happen when the
request is not fully built when the observation starts. At that point,
the tags are built for long task timers, but not for the actual metric.
This effectively overrides the correct value of the URI template in the
builder.

This commit removes this builder update which was invalid in the first
place.

Fixes gh-40330
2024-04-12 16:31:02 +02:00
Andy Wilkinson
1266516605 Merge branch '3.1.x' into 3.2.x 2024-04-12 11:19:33 +01:00
Andy Wilkinson
12e004f131 Revert "Exclude unwanted javax.inject dependency from Data Couchbase"
This reverts commit 06f5ab162f. The
dependency has been removed in Data Couchbase, making the exclude
unnecessary.

See gh-40200
2024-04-12 11:19:16 +01:00
Andy Wilkinson
1c5ba19e86 Merge branch '3.1.x' into 3.2.x
Closes gh-40326
2024-04-12 10:31:26 +01:00
Andy Wilkinson
a946f66e7c Minimize pollution of Log4j2's environment
Closes gh-40178
2024-04-12 10:25:25 +01:00