[Elasticsearch] Fix reporting of dropped by duplicate metrics (#679)

spotify · Jul 21, 2020 · 6353fef · 6353fef
1 parent f2e6baa
commit 6353fef
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/...ch-utils/src/main/java/com/spotify/heroic/elasticsearch/AbstractElasticsearchBackend.java b/...ch-utils/src/main/java/com/spotify/heroic/elasticsearch/AbstractElasticsearchBackend.java
@@ -56,7 +56,8 @@ protected <T> Transform<Throwable, T> handleVersionConflict(
         Provider<T> emptyProvider, Runnable reportWriteDroppedByDuplicate
     ) {
         return throwable -> {
-            if (ExceptionUtils.getRootCause(throwable) instanceof VersionConflictEngineException) {
+            if (ExceptionUtils.getRootCause(throwable) instanceof VersionConflictEngineException ||
+                throwable.getMessage().contains("version_conflict_engine_exception")) {
                 // Index request rejected, document already exists. That's ok, return success.
                 reportWriteDroppedByDuplicate.run();
                 return emptyProvider.get();

diff --git a/...st/src/test/java/com/spotify/heroic/suggest/elasticsearch/AbstractSuggestBackendKVIT.java b/...st/src/test/java/com/spotify/heroic/suggest/elasticsearch/AbstractSuggestBackendKVIT.java
@@ -26,6 +26,7 @@
 import com.spotify.heroic.elasticsearch.ClientWrapper;
 import com.spotify.heroic.elasticsearch.ConnectionModule;
 import com.spotify.heroic.elasticsearch.index.RotatingIndexMapping;
+import com.spotify.heroic.metric.RequestError;
 import com.spotify.heroic.suggest.SuggestModule;
 import com.spotify.heroic.suggest.WriteSuggest;
 import com.spotify.heroic.test.AbstractSuggestBackendIT;
@@ -69,5 +70,10 @@ public void writeDuplicatesReturnErrorInResponse() throws Exception {
 
         assertEquals(0, firstWrite.getErrors().size());
         assertEquals(2, secondWrite.getErrors().size());
+
+        for (final RequestError e : secondWrite.getErrors()) {
+            assert (e.toString().contains("VersionConflictEngineException") ||
+                    e.toString().contains("version_conflict_engine_exception"));
+        }
     }
 }
diff --git a/...lasticsearch/src/main/java/com/spotify/heroic/suggest/elasticsearch/SuggestBackendKV.java b/...lasticsearch/src/main/java/com/spotify/heroic/suggest/elasticsearch/SuggestBackendKV.java
@@ -679,7 +679,9 @@ public AsyncFuture<WriteSuggest> write(
                                     errors.add(NodeError.internalError(r.getFailureMessage()));
 
                                     if (r.getFailure().getCause()
-                                        instanceof VersionConflictEngineException) {
+                                        instanceof VersionConflictEngineException ||
+                                        r.getFailure().getMessage()
+                                        .contains("version_conflict_engine_exception")) {
                                         reporter.reportWriteDroppedByDuplicate();
                                     } else if (addFailureAnnotation) {
                                         rootSpan.addAnnotation(r.getFailureMessage());