Merge remote-tracking branch 'upstream/development' into fix_pca_dete…

…ctor
ait-aecid · Mar 26, 2024 · f9c055e · f9c055e
2 parents 4cbbeea + 75ea44b
commit f9c055e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/aecid-testsuite/integration/declarations.sh b/aecid-testsuite/integration/declarations.sh
@@ -717,7 +717,7 @@ function checkAllSyslogs(){
 
 # This function checks if the output of the Kafka Topic is as expected.
 function checkKafkaTopic(){
-  out=$($KAFKA_VERSIONSTRING/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic test_topic --from-beginning --timeout-ms 30000)
+  out=$($KAFKA_VERSIONSTRING/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic test_topic --from-beginning --timeout-ms 60000)
   for t in "${JSON_OUTPUT[@]}"
   do
     if [[ $out != *"$t"* ]]; then

diff --git a/aecid-testsuite/unit/events/KafkaEventHandlerTest.py b/aecid-testsuite/unit/events/KafkaEventHandlerTest.py
@@ -38,7 +38,7 @@ class KafkaEventHandlerTest(TestBase):
     def setUpClass(cls):
         """Start a KafkaConsumer."""
         cls.consumer = KafkaConsumer(
-            cls.kafka_topic, bootstrap_servers=['localhost:9092'], enable_auto_commit=True, consumer_timeout_ms=30000,
+            cls.kafka_topic, bootstrap_servers=['localhost:9092'], enable_auto_commit=True, consumer_timeout_ms=60000,
             group_id=cls.kafka_group, value_deserializer=lambda x: x.decode(), api_version=(2, 0, 1), auto_offset_reset='earliest')
 
     @classmethod

diff --git a/source/root/usr/lib/logdata-anomaly-miner/aminer/analysis/CharsetDetector.py b/source/root/usr/lib/logdata-anomaly-miner/aminer/analysis/CharsetDetector.py
@@ -95,6 +95,8 @@ def receive_atom(self, log_atom):
                 matches.append(match)
             for match in matches:
                 value = match.match_object
+                if not isinstance(match.match_object, bytes):
+                    value = str(match.match_object).encode(AminerConfig.ENCODING)
                 if value is not None:
                     all_values_none = False
                 values.append(value)

diff --git a/source/root/usr/lib/logdata-anomaly-miner/aminer/analysis/EntropyDetector.py b/source/root/usr/lib/logdata-anomaly-miner/aminer/analysis/EntropyDetector.py
@@ -117,6 +117,8 @@ def receive_atom(self, log_atom):
                 matches.append(match)
             for match in matches:
                 value = match.match_object
+                if not isinstance(match.match_object, bytes):
+                    value = str(match.match_object).encode(AminerConfig.ENCODING)
                 if value is not None:
                     all_values_none = False
                 values.append(value)