Juergen Hoeller
b2d43f54e0
Merge branch '6.1.x'
2024-05-10 12:29:49 +02:00
Juergen Hoeller
bf08e0c1b4
Polishing
2024-05-10 12:27:29 +02:00
Brian Clozel
ccf9ba86a0
Merge branch '6.1.x'
2024-04-18 21:45:23 +02:00
Brian Clozel
0268180799
Rethrow unhandled JMS listener exceptions
...
Fixes gh-32666
2024-04-18 21:44:44 +02:00
Stéphane Nicoll
330dcf15bc
Polish "Use try-with-resources when applicable"
...
See gh-32610
2024-04-10 09:49:35 +02:00
ali dandach
82b51479d5
Use try-with-resources when applicable
...
See gh-32610
2024-04-10 09:49:17 +02:00
Brian Clozel
c3aa0cd815
Merge branch '6.1.x'
2024-04-09 18:36:53 +02:00
Brian Clozel
ac74116d76
Instrument JmsTemplate#sendAndReceive
...
Prior to this commit, the `JmsTemplate#sendAndReceive` method would not
instrument the JMS session. This means that no metric would be recorded
when sending the message and no trace would be propagated downstream.
This commit ensures that the JMS session is instrumented in this case as
well. Note, the reception of the response message does not create a
`"jms.message.process"` observation as the session is only receiving the
message, no listener has been configured on the message consumer.
Fixes gh-32606
2024-04-09 18:34:09 +02:00
Sébastien Deleuze
8b51b36729
Perform NullAway build-time checks in more modules
...
This commit enables null-safety build-time checks in
all remaining modules except spring-test.
See gh-32475
2024-03-26 15:53:01 +01:00
Sébastien Deleuze
88e26a9570
Merge branch '6.1.x'
2024-03-25 11:28:43 +01:00
Sébastien Deleuze
06b91c4ea5
Refine null-safety in spring-jms
...
See gh-32475
2024-03-25 11:28:00 +01:00
Sébastien Deleuze
2fc78dfb69
Perform NullAway build-time checks in spring-jms
...
See gh-32475
2024-03-25 11:27:04 +01:00
Juergen Hoeller
6df27644eb
Merge branch '6.1.x'
2024-03-18 16:04:26 +01:00
Juergen Hoeller
cd7ba1835c
Propagate JMS IllegalStateException from commit/rollbackIfNecessary
...
Closes gh-32473
2024-03-18 16:03:13 +01:00
Brian Clozel
ae5cff1705
Merge branch '6.1.x'
2024-03-18 14:37:21 +01:00
Brian Clozel
521d4f24d0
Remove flaky test in JMS observation
...
There is no way to consistently test this use case because listener
container implementations have different behavior for unhandled errors
and might retry or close the container altogether.
See gh-32458
2024-03-18 14:35:42 +01:00
Brian Clozel
9cd4d32195
Merge branch '6.1.x'
2024-03-18 12:18:29 +01:00
Brian Clozel
c1424acb94
Fix flaky test in JMS observability
...
See gh-32458
2024-03-18 12:17:57 +01:00
Brian Clozel
10e8039de8
Merge branch '6.1.x'
2024-03-15 22:48:12 +01:00
Brian Clozel
a78704af24
Record unhanlded JMS exceptions as observation errors
...
Prior to this commit, when using the `DefaultMessageListenerContainer`
as a backing listener container for JMS messages, the instrumentation
would not record JMS exceptions as observation errors when they were not
handled by configured `ErrorHandler`.
This commit ensures that this is the case.
Fixes gh-32458
2024-03-15 22:45:36 +01:00
Sam Brannen
20be9e150c
Polishing
2024-03-09 14:28:01 +01:00
Juergen Hoeller
4d206f79d0
Merge branch '6.1.x'
...
# Conflicts:
# spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java
2024-02-26 13:42:00 +01:00
Juergen Hoeller
479879c53a
Polishing
2024-02-26 13:40:21 +01:00
Juergen Hoeller
5c589833d7
Revise idleReceivesPerTaskLimit for surplus tasks on default/simple executor
...
Closes gh-32260
2024-02-25 19:00:56 +01:00
Sam Brannen
122372c580
Spring cleaning: update copyright headers
2024-02-23 12:21:22 +01:00
Juergen Hoeller
902e5707a8
Revise singleton registry for lenient locking (fallback instead of deadlock)
...
Closes gh-23501
2024-02-19 15:49:33 +01:00
Juergen Hoeller
0ddfe3977a
Merge branch '6.1.x'
2024-02-16 22:50:04 +01:00
Juergen Hoeller
3aae7a66e6
Polishing
2024-02-16 22:27:09 +01:00
Juergen Hoeller
7ee8e66c7f
Avoid internal lifecycle synchronization in favor of lifecycle lock
...
Closes gh-32284
2024-02-16 12:42:39 +01:00
Juergen Hoeller
34372ee32b
Introduce lock-based lifecycle waiting and default virtual threads flag
...
Closes gh-32252
2024-02-16 12:42:27 +01:00
Stéphane Nicoll
1f2d29ee08
Polish
2024-01-08 17:12:33 +01:00
Johnny Lim
0ad561d379
Ensure that Observation is stopped and scope is closed in doReceiveAndExecute()
...
Closes gh-31798
2024-01-05 14:45:58 +01:00
Stéphane Nicoll
adcf236a3d
Polish "Use Object.equals() where feasible"
...
See gh-31916
2023-12-28 13:21:46 +01:00
Yanming Zhou
72a9864788
Use Object.equals() where feasible
...
See gh-31916
2023-12-28 13:19:03 +01:00
Stéphane Nicoll
a6e87b40c7
Polish "Use diamond operator where feasible"
...
See gh-31916
2023-12-28 13:14:26 +01:00
Yanming Zhou
094479b55f
Use diamond operator where feasible
...
See gh-31916
2023-12-28 13:08:08 +01:00
Stéphane Nicoll
70f31dee45
Polish
2023-12-27 13:04:21 +01:00
Sam Brannen
c0683cd30b
Update copyright headers
2023-12-12 14:51:03 +01:00
Yanming Zhou
afcd03bddc
Replace assertThat(x.isEmpty()).isTrue() with assertThat(x).isEmpty()
...
Search for : assertThat\((.+).isEmpty\(\)\).isTrue\(\)
Replace with : assertThat($1).isEmpty()
Search for : assertThat\((.+).isEmpty\(\)\).isFalse\(\)
Replace with : assertThat($1).isNotEmpty()
Closes gh-31758
2023-12-06 10:04:56 +01:00
Yanming Zhou
785ad399e9
Replace assertThat(x.iterator().next()) with assertThat(x).element(0)
...
Search for : assertThat\((.+).iterator\(\).next\(\)\)
Replace with : assertThat($1).element(0)
2023-12-06 10:52:39 +08:00
Sam Brannen
b69e5acfe3
Revert use of yield in switch expressions due to Eclipse compiler error
...
See gh-31531
2023-12-04 16:47:25 +01:00
Sam Brannen
d71853f105
Polish contribution
...
See gh-31531
2023-12-04 16:47:25 +01:00
Yanming Zhou
490b5c77fc
Use switch expression where feasible
2023-12-04 15:42:55 +01:00
Brian Clozel
dbb2d4f1d3
Extend JMS observation scope to error handling
...
Prior to this commit, the JMS listener observations would only cover the
actual listener invocation, but not the error handling phase. This means
that all errors (including the handled ones) are marked as errors in the
observation and that the observation is not current anymore when error
handling happens.
This commit aligns the behavior with the other Spring Framework
instrumentations and ensures that the error handling phase is fully part
of the observation recording.
Closes gh-31559
2023-11-07 11:18:03 +01:00
Juergen Hoeller
8457c768e8
Polishing
2023-10-23 16:56:40 +02:00
Sam Brannen
2d792f000a
Polish "Apply SingleSpaceSeparator Checkstyle module"
...
See gh-31469
2023-10-22 14:18:18 +02:00
Johnny Lim
64e9fcad53
Apply SingleSpaceSeparator Checkstyle module
...
This commit also fixes its violations.
Closes gh-31469
2023-10-22 14:09:57 +02:00
Johnny Lim
919faa2ce2
Order modifiers to align with JLS
...
This commit also applies Checkstyle ModifierOrder to enforce it.
See gh-31368
2023-10-17 16:13:56 +02:00
Brian Clozel
8d6b499cf1
Polish
...
See gh-31398
2023-10-10 20:42:45 +02:00
Brian Clozel
99c673f3ea
Upgrade to Micrometer 1.12.0-RC1
...
Closes gh-31398
2023-10-10 15:40:32 +02:00