From 93b269d65746aacbf5ab3a42bf291c72008026e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harri=20Sm=C3=A5tt?= Date: Sat, 28 Sep 2024 00:56:22 +0300 Subject: [PATCH] [#3656] Add Message Tracing logs --- .../coap/AbstractVertxBasedCoapAdapter.java | 7 +++++ .../hono/adapter/coap/CoapAdapterOptions.java | 10 +++++++ .../adapter/coap/CoapAdapterProperties.java | 30 +++++++++++++++++++ .../admin-guide/coap-adapter-config.md | 1 + 4 files changed, 48 insertions(+) diff --git a/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/AbstractVertxBasedCoapAdapter.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/AbstractVertxBasedCoapAdapter.java index f56859b603..477e94f36f 100644 --- a/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/AbstractVertxBasedCoapAdapter.java +++ b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/AbstractVertxBasedCoapAdapter.java @@ -20,6 +20,7 @@ import org.eclipse.californium.core.CoapServer; import org.eclipse.californium.core.coap.CoAP; import org.eclipse.californium.core.network.Endpoint; +import org.eclipse.californium.core.network.interceptors.MessageTracer; import org.eclipse.californium.core.server.resources.Resource; import org.eclipse.hono.adapter.AbstractProtocolAdapterBase; import org.eclipse.hono.util.Constants; @@ -198,6 +199,9 @@ protected Resource createRoot() { final Future secureEndpointFuture = endpointFactory.getSecureEndpoint() .onFailure(t -> log.info("not creating secure endpoint: {}", t.getMessage())) .onSuccess(ep -> { + if (getConfig().isMessageTracingLogEnabled()) { + ep.addInterceptor(new MessageTracer()); + } ep.addInterceptor(internalErrorTracer); newServer.addEndpoint(ep); this.secureEndpoint = ep; @@ -205,6 +209,9 @@ protected Resource createRoot() { final Future insecureEndpointFuture = endpointFactory.getInsecureEndpoint() .onFailure(t -> log.info("not creating insecure endpoint: {}", t.getMessage())) .onSuccess(ep -> { + if (getConfig().isMessageTracingLogEnabled()) { + ep.addInterceptor(new MessageTracer()); + } ep.addInterceptor(internalErrorTracer); newServer.addEndpoint(ep); this.insecureEndpoint = ep; diff --git a/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/CoapAdapterOptions.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/CoapAdapterOptions.java index e71688c0d8..f5bfd29243 100644 --- a/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/CoapAdapterOptions.java +++ b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/CoapAdapterOptions.java @@ -152,4 +152,14 @@ public interface CoapAdapterOptions { */ @WithDefault("500") int timeoutToAck(); + + /** + * Checks, if message tracing log is enabled. + *

+ * When enabled, the CoAP adapter will log all incoming and outgoing messages tracing information. + * + * @return {@code true} enable message tracing log, {@code false} disable message tracing log. + */ + @WithDefault("false") + boolean messageTracingLogEnabled(); } diff --git a/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/CoapAdapterProperties.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/CoapAdapterProperties.java index 1cd149dc64..b303b46288 100644 --- a/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/CoapAdapterProperties.java +++ b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/CoapAdapterProperties.java @@ -66,6 +66,11 @@ public class CoapAdapterProperties extends ProtocolAdapterProperties { * that time, the status gets removed and a new request will fail. */ public static final int DEFAULT_BLOCKWISE_STATUS_LIFETIME = 300000; + /** + * The default for message tracing log. When message tracing is enabled, the CoAP adapter + * will log all incoming and outgoing messages. This is useful for debugging purposes. + */ + public static final boolean DEFAULT_MESSAGE_TRACING_LOG = false; static { DEFAULT_CONNECTOR_THREADS = 2; @@ -91,6 +96,7 @@ public class CoapAdapterProperties extends ProtocolAdapterProperties { private int blockwiseStatusLifetime = DEFAULT_BLOCKWISE_STATUS_LIFETIME; private boolean messageOffloadingEnabled = DEFAULT_MESSAGE_OFFLOADING; private int timeoutToAck = DEFAULT_TIMEOUT_TO_ACK; + private boolean messageTracingLogEnabled = DEFAULT_MESSAGE_TRACING_LOG; /** * Creates properties using default values. @@ -117,6 +123,7 @@ public CoapAdapterProperties(final CoapAdapterOptions options) { this.networkConfig = options.networkConfig().orElse(null); this.secureNetworkConfig = options.secureNetworkConfig().orElse(null); setTimeoutToAck(options.timeoutToAck()); + this.messageTracingLogEnabled = options.messageTracingLogEnabled(); } /** @@ -466,4 +473,27 @@ public final void setTimeoutToAck(final int timeoutToAck) { } this.timeoutToAck = timeoutToAck; } + + /** + * Returns the current message tracing log mode. + *

+ * When message tracing is enabled, the CoAP adapter will log all incoming and outgoing messages. + *

+ * @return {@code true} if message tracing log is enabled, {@code false} if it's disabled. + */ + public final boolean isMessageTracingLogEnabled() { + return messageTracingLogEnabled; + } + + /** + * Sets the message tracing log mode. + *

+ * When message tracing is enabled, the CoAP adapter will log all incoming and outgoing messages. + * Setting this property has effect only during the application startup. + *

+ * @param messageTracingLog {@code true} enable message tracing log, {@code false} disable message tracing log. + */ + public final void setMessageTracingLogEnabled(final boolean messageTracingLog) { + this.messageTracingLogEnabled = messageTracingLog; + } } diff --git a/site/documentation/content/admin-guide/coap-adapter-config.md b/site/documentation/content/admin-guide/coap-adapter-config.md index 526e102e80..df1e09c3f7 100644 --- a/site/documentation/content/admin-guide/coap-adapter-config.md +++ b/site/documentation/content/admin-guide/coap-adapter-config.md @@ -45,6 +45,7 @@ configuring the CoAP adapter. | `HONO_COAP_MAXCONNECTIONS`
`hono.coap.maxConnections` | no | `0` | The maximum number of concurrent DTLS connections that the protocol adapter should accept. If set to `0`, the protocol adapter determines a reasonable value based on the available resources like memory and CPU. | | `HONO_COAP_MAXPAYLOADSIZE`
`hono.coap.maxPayloadSize` | no | `2048` | The maximum allowed size of an incoming CoAP request's body in bytes. Requests with a larger body size are rejected with a 4.13 `Request entity too large` response. | | `HONO_COAP_MESSAGEOFFLOADINGENABLED`
`hono.coap.messageOffloadingEnabled` | no | true | Enables to clear payload and serialized messages kept for deduplication in order to reduce the heap consumption. Experimental. | +| `HONO_COAP_MESSAGETRACINGLOGENABLED`
`hono.coap.messageTracingLogEnabled` | no | `false` | If set to `true` the protocol adapter will start to log every incoming and outgoing CoAP messages tracing information. | | `HONO_COAP_NETWORKCONFIG`
`hono.coap.networkConfig` | no | - | The absolute path to a Californium properties file containing network configuration properties that should be used for the insecure and secure CoAP port. If not set, Californium's default properties will be used. Values may be overwritten using the specific `HONO_COAP_INSECURENETWORKCONFIG` or `HONO_COAP_SECURENETWORKCONFIG`. If the file is not available, not readable or malformed, the adapter will fail to start. | | `HONO_COAP_PORT`
`hono.coap.port` | no | - | The secure port that the protocol adapter should listen on.
See [Port Configuration]({{< relref "#port-configuration" >}}) below for details. | | `HONO_COAP_SECURENETWORKCONFIG`
`hono.coap.secureNetworkConfig` | no | - | The absolute path to a Californium properties file containing network configuration properties that should be used for the secure CoAP port. If not set, Californium's default properties will be used. If the file is not available, not readable or malformed, the adapter will fail to start. |