Issue #561: fixed enrichment error reporting via Websocket - had to b…

…e wrapped in a DittoProtocol message Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch-si.com>
eclipse-ditto · Jan 24, 2020 · 6f3bcab · 6f3bcab
1 parent ef07c6b
commit 6f3bcab
Showing 1 changed file with 20 additions and 4 deletions.
diff --git a/...in/java/org/eclipse/ditto/services/gateway/endpoints/routes/websocket/WebSocketRoute.java b/...in/java/org/eclipse/ditto/services/gateway/endpoints/routes/websocket/WebSocketRoute.java
@@ -646,7 +646,7 @@ private static Function<SessionedJsonifiable, CompletionStage<Collection<String>
                     matchesFilter(sessionedJsonifiable, extra)
                             ? Collections.singletonList(toJsonStringWithExtra(adaptable, extra))
                             : Collections.emptyList())
-                    .exceptionally(WebSocketRoute::reportEnrichmentError);
+                    .exceptionally(error -> WebSocketRoute.reportEnrichmentError(error, adapter, adaptable));
         };
     }
 
@@ -664,14 +664,30 @@ private static TopicPath.Channel determineChannel(final SessionedJsonifiable ses
                 });
     }
 
-    private static Collection<String> reportEnrichmentError(final Throwable error) {
+    private static Collection<String> reportEnrichmentError(final Throwable error,
+            final ProtocolAdapter adapter,
+            final Adaptable adaptable) {
         final DittoRuntimeException errorToReport;
         if (error instanceof DittoRuntimeException) {
             errorToReport = ((DittoRuntimeException) error);
         } else {
-            errorToReport = SignalEnrichmentFailedException.newBuilder().build();
+            errorToReport = SignalEnrichmentFailedException.newBuilder()
+                    .dittoHeaders(adaptable.getDittoHeaders())
+                    .cause(error)
+                    .build();
         }
-        return Collections.singletonList(errorToReport.toJsonString());
+        LOGGER.withCorrelationId(adaptable.getDittoHeaders())
+                .error("Signal enrichment failed due to: {}", error.getMessage(), errorToReport);
+
+        final JsonifiableAdaptable errorAdaptable =
+                ProtocolFactory.wrapAsJsonifiableAdaptable(adapter.toAdaptable(
+                        ThingErrorResponse.of(
+                                ThingId.of(adaptable.getTopicPath().getNamespace(), adaptable.getTopicPath().getId()),
+                                errorToReport,
+                                adaptable.getDittoHeaders()
+                        )
+                ));
+        return Collections.singletonList(errorAdaptable.toJsonString());
     }
 
     private static String toJsonStringWithExtra(final Adaptable adaptable, final JsonObject extra) {