Skip to content

Commit 874f056

Browse files
committed
Polishing
1 parent b77db64 commit 874f056

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

framework-docs/modules/ROOT/pages/integration/jms/receiving.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ the receiver should wait before giving up waiting for a message.
1919
== Asynchronous reception: Message-Driven POJOs
2020

2121
NOTE: Spring also supports annotated-listener endpoints through the use of the `@JmsListener`
22-
annotation and provides an open infrastructure to register endpoints programmatically.
23-
This is, by far, the most convenient way to setup an asynchronous receiver.
22+
annotation and provides open infrastructure to register endpoints programmatically.
23+
This is, by far, the most convenient way to set up an asynchronous receiver.
2424
See xref:integration/jms/annotated.adoc#jms-annotated-support[Enable Listener Endpoint Annotations] for more details.
2525

2626
In a fashion similar to a Message-Driven Bean (MDB) in the EJB world, the Message-Driven

framework-docs/modules/ROOT/pages/integration/observability.adoc

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ As outlined xref:integration/observability.adoc[at the beginning of this section
3737
|Processing time for an execution of a `@Scheduled` task
3838
|===
3939

40-
NOTE: Observations are using Micrometer's official naming convention, but Metrics names will be automatically converted
40+
NOTE: Observations use Micrometer's official naming convention, but Metrics names will be automatically converted
4141
{micrometer-docs}/concepts/naming.html[to the format preferred by the monitoring system backend]
4242
(Prometheus, Atlas, Graphite, InfluxDB...).
4343

@@ -97,7 +97,7 @@ This can be done by declaring a `SchedulingConfigurer` bean that sets the observ
9797

9898
include-code::./ObservationSchedulingConfigurer[]
9999

100-
It is using the `org.springframework.scheduling.support.DefaultScheduledTaskObservationConvention` by default, backed by the `ScheduledTaskObservationContext`.
100+
It uses the `org.springframework.scheduling.support.DefaultScheduledTaskObservationConvention` by default, backed by the `ScheduledTaskObservationContext`.
101101
You can configure a custom implementation on the `ObservationRegistry` directly.
102102
During the execution of the scheduled method, the current observation is restored in the `ThreadLocal` context or the Reactor context (if the scheduled method returns a `Mono` or `Flux` type).
103103

@@ -107,7 +107,7 @@ By default, the following `KeyValues` are created:
107107
[cols="a,a"]
108108
|===
109109
|Name | Description
110-
|`code.function` _(required)_|Name of Java `Method` that is scheduled for execution.
110+
|`code.function` _(required)_|Name of the Java `Method` that is scheduled for execution.
111111
|`code.namespace` _(required)_|Canonical name of the class of the bean instance that holds the scheduled method, or `"ANONYMOUS"` for anonymous classes.
112112
|`error` _(required)_|Class name of the exception thrown during the execution, or `"none"` if no exception happened.
113113
|`exception` _(deprecated)_|Duplicates the `error` key and might be removed in the future.
@@ -138,15 +138,15 @@ By default, both observations share the same set of possible `KeyValues`:
138138
|`error` |Class name of the exception thrown during the messaging operation (or "none").
139139
|`exception` _(deprecated)_|Duplicates the `error` key and might be removed in the future.
140140
|`messaging.destination.temporary` _(required)_|Whether the destination is a `TemporaryQueue` or `TemporaryTopic` (values: `"true"` or `"false"`).
141-
|`messaging.operation` _(required)_|Name of JMS operation being performed (values: `"publish"` or `"process"`).
141+
|`messaging.operation` _(required)_|Name of the JMS operation being performed (values: `"publish"` or `"process"`).
142142
|===
143143

144144
.High cardinality Keys
145145
[cols="a,a"]
146146
|===
147147
|Name | Description
148148
|`messaging.message.conversation_id` |The correlation ID of the JMS message.
149-
|`messaging.destination.name` |The name of destination the current message was sent to.
149+
|`messaging.destination.name` |The name of the destination the current message was sent to.
150150
|`messaging.message.id` |Value used by the messaging system as an identifier for the message.
151151
|===
152152

@@ -213,7 +213,7 @@ By default, the following `KeyValues` are created:
213213
|Name | Description
214214
|`error` _(required)_|Class name of the exception thrown during the exchange, or `"none"` if no exception happened.
215215
|`exception` _(deprecated)_|Duplicates the `error` key and might be removed in the future.
216-
|`method` _(required)_|Name of HTTP request method or `"none"` if not a well-known method.
216+
|`method` _(required)_|Name of the HTTP request method or `"none"` if not a well-known method.
217217
|`outcome` _(required)_|Outcome of the HTTP server exchange.
218218
|`status` _(required)_|HTTP response raw status code, or `"UNKNOWN"` if no response was created.
219219
|`uri` _(required)_|URI pattern for the matching handler if available, falling back to `REDIRECTION` for 3xx responses, `NOT_FOUND` for 404 responses, `root` for requests with no path info, and `UNKNOWN` for all other requests.
@@ -235,7 +235,7 @@ This can be done on the `WebHttpHandlerBuilder`, as follows:
235235

236236
include-code::./HttpHandlerConfiguration[]
237237

238-
It is using the `org.springframework.http.server.reactive.observation.DefaultServerRequestObservationConvention` by default, backed by the `ServerRequestObservationContext`.
238+
It uses the `org.springframework.http.server.reactive.observation.DefaultServerRequestObservationConvention` by default, backed by the `ServerRequestObservationContext`.
239239

240240
This will only record an observation as an error if the `Exception` has not been handled by an application Controller.
241241
Typically, all exceptions handled by Spring WebFlux's `@ExceptionHandler` and xref:web/webflux/ann-rest-exceptions.adoc[`ProblemDetail` support] will not be recorded with the observation.
@@ -251,7 +251,7 @@ By default, the following `KeyValues` are created:
251251
|Name | Description
252252
|`error` _(required)_|Class name of the exception thrown during the exchange, or `"none"` if no exception happened.
253253
|`exception` _(deprecated)_|Duplicates the `error` key and might be removed in the future.
254-
|`method` _(required)_|Name of HTTP request method or `"none"` if not a well-known method.
254+
|`method` _(required)_|Name of the HTTP request method or `"none"` if not a well-known method.
255255
|`outcome` _(required)_|Outcome of the HTTP server exchange.
256256
|`status` _(required)_|HTTP response raw status code, or `"UNKNOWN"` if no response was created.
257257
|`uri` _(required)_|URI pattern for the matching handler if available, falling back to `REDIRECTION` for 3xx responses, `NOT_FOUND` for 404 responses, `root` for requests with no path info, and `UNKNOWN` for all other requests.
@@ -284,7 +284,7 @@ Instrumentation uses the `org.springframework.http.client.observation.ClientRequ
284284
[cols="a,a"]
285285
|===
286286
|Name | Description
287-
|`method` _(required)_|Name of HTTP request method or `"none"` if not a well-known method.
287+
|`method` _(required)_|Name of the HTTP request method or `"none"` if not a well-known method.
288288
|`uri` _(required)_|URI template used for HTTP request, or `"none"` if none was provided. Only the path part of the URI is considered.
289289
|`client.name` _(required)_|Client name derived from the request URI host.
290290
|`status` _(required)_|HTTP response raw status code, or `"IO_ERROR"` in case of `IOException`, or `"CLIENT_ERROR"` if no response was received.
@@ -312,7 +312,7 @@ Instrumentation uses the `org.springframework.http.client.observation.ClientRequ
312312
[cols="a,a"]
313313
|===
314314
|Name | Description
315-
|`method` _(required)_|Name of HTTP request method or `"none"` if the request could not be created.
315+
|`method` _(required)_|Name of the HTTP request method or `"none"` if the request could not be created.
316316
|`uri` _(required)_|URI template used for HTTP request, or `"none"` if none was provided. Only the path part of the URI is considered.
317317
|`client.name` _(required)_|Client name derived from the request URI host.
318318
|`status` _(required)_|HTTP response raw status code, or `"IO_ERROR"` in case of `IOException`, or `"CLIENT_ERROR"` if no response was received.
@@ -341,7 +341,7 @@ Instrumentation uses the `org.springframework.web.reactive.function.client.Clien
341341
[cols="a,a"]
342342
|===
343343
|Name | Description
344-
|`method` _(required)_|Name of HTTP request method or `"none"` if not a well-known method.
344+
|`method` _(required)_|Name of the HTTP request method or `"none"` if not a well-known method.
345345
|`uri` _(required)_|URI template used for HTTP request, or `"none"` if none was provided. Only the path part of the URI is considered.
346346
|`client.name` _(required)_|Client name derived from the request URI host.
347347
|`status` _(required)_|HTTP response raw status code, or `"IO_ERROR"` in case of `IOException`, or `"CLIENT_ERROR"` if no response was received.

0 commit comments

Comments
 (0)