hotfix: checkLevel and LevelEventFilter work when value is not in enum,

add modules to makefile

Author: Tatyana Tokmyanina

Makefile

@@ -16,7 +16,9 @@ SERVICES := hercules-elastic-adapter \
         hercules-tracing-api \
         hercules-tracing-sink \
         hercules-tracing-sink-clickhouse \
-        hercules-init
+        hercules-init \
+        hercules-routing \
+        hercules-opentelemetry-adapter
 
 
 .PHONY: all build_images push_images

hercules-sentry-sink/src/main/java/ru/kontur/vostok/hercules/sentry/sink/SentrySyncProcessor.java

@@ -119,9 +119,12 @@ public boolean process(Event event) throws BackendServiceFailedException {
     }
 
     private boolean checkLevel(Event event) {
-        final Optional<String> value = ContainerUtil.extract(event.getPayload(), LogEventTags.LEVEL_TAG);
-        SentryLevel level = value.map(sentryLevelParser::parse).orElse(ParsingResult.of(SentryLevel.INFO)).get();
-        return defaultLevel.compareTo(level) >= 0;
+        return  ContainerUtil.extract(event.getPayload(), LogEventTags.LEVEL_TAG)
+                .map(sentryLevelParser::parse)
+                .filter(ParsingResult::hasValue)
+                .map(ParsingResult::get)
+                .map(value -> defaultLevel.compareTo(value) >= 0)
+                .orElse(false);
     }
 
     public void stop() {

hercules-sentry-sink/src/main/java/ru/kontur/vostok/hercules/sentry/sink/filter/LevelEventFilter.java

@@ -31,9 +31,12 @@ public LevelEventFilter(Properties properties) {
 
     @Override
     public boolean test(Event event) {
-        final Optional<String> value = ContainerUtil.extract(event.getPayload(), LogEventTags.LEVEL_TAG);
-        SentryLevel currentLevel = value.map(sentryLevelParser::parse).orElse(ParsingResult.of(SentryLevel.INFO)).get();
-        return level.compareTo(currentLevel) >= 0;
+        return  ContainerUtil.extract(event.getPayload(), LogEventTags.LEVEL_TAG)
+                .map(sentryLevelParser::parse)
+                .filter(ParsingResult::hasValue)
+                .map(ParsingResult::get)
+                .map(value -> level.compareTo(value) >= 0)
+                .orElse(false);
     }
 
     private static class Props {

hercules-sentry-sink/src/test/java/ru/kontur/vostok/hercules/sentry/sink/filter/LevelEventFilterTest.java

@@ -51,6 +51,15 @@ public void shouldReturnFalseIfLevelIsLowerThenRequired() {
         Assert.assertFalse(filter.test(event));
     }
 
+    @Test
+    public void shouldReturnFalseIfLevelIsUnexpected() {
+        Event event = getEventBuilder()
+                .tag("level", Variant.ofString("informational"))
+                .build();
+
+        Assert.assertFalse(filter.test(event));
+    }
+
     @Test
     public void shouldReturnFalseIfLevelTagIsAbsent() {
         Event event = getEventBuilder().build();