Forward all SerializationExceptions by default

bakdata · Mar 21, 2024 · e1c4c5a · e1c4c5a
1 parent 632a98e
commit e1c4c5a
Show file tree

Hide file tree

Showing 35 changed files with 100 additions and 133 deletions.
diff --git a/.github/workflows/build-and-publish.yaml b/.github/workflows/build-and-publish.yaml
@@ -8,7 +8,7 @@ on:
 jobs:
   build-and-publish:
     name: Java Gradle
-    uses: bakdata/ci-templates/.github/workflows/java-gradle-library.yaml@1.40.6
+    uses: bakdata/ci-templates/.github/workflows/java-gradle-library.yaml@1.43.0
     with:
       java-version: 17
     secrets:
@@ -19,5 +19,4 @@ jobs:
       signing-password: ${{ secrets.SONATYPE_SIGNING_PASSWORD }}
       ossrh-username: ${{ secrets.SONATYPE_OSSRH_USERNAME }}
       ossrh-password: ${{ secrets.SONATYPE_OSSRH_PASSWORD }}
-      github-username: ${{ secrets.GH_USERNAME }}
       github-token: ${{ secrets.GH_TOKEN }}
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -16,7 +16,7 @@ on:
 jobs:
   java-gradle-release:
     name: Java Gradle
-    uses: bakdata/ci-templates/.github/workflows/java-gradle-release.yaml@1.40.6
+    uses: bakdata/ci-templates/.github/workflows/java-gradle-release.yaml@1.43.0
     with:
       java-version: 17
       release-type: "${{ inputs.release-type }}"

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,8 +1,7 @@
 plugins {
-    id("net.researchgate.release") version "3.0.2"
-    id("com.bakdata.sonar") version "1.1.17"
-    id("com.bakdata.sonatype") version "1.1.14"
-    id("org.hildan.github.changelog") version "2.2.0"
+    id("com.bakdata.release") version "1.4.0"
+    id("com.bakdata.sonar") version "1.4.0"
+    id("com.bakdata.sonatype") version "1.4.0"
     id("io.freefair.lombok") version "8.4"
 }
 
@@ -41,13 +40,6 @@ configure<com.bakdata.gradle.SonatypeSettings> {
     }
 }
 
-configure<org.hildan.github.changelog.plugin.GitHubChangelogExtension> {
-    githubUser = "bakdata"
-    githubRepository = "kafka-error-handling"
-    futureVersionTag = findProperty("changelog.releaseVersion")?.toString()
-    sinceTag = findProperty("changelog.sinceTag")?.toString()
-}
-
 subprojects {
     apply(plugin = "java-library")
     apply(plugin = "java-test-fixtures")
@@ -59,9 +51,3 @@ subprojects {
         }
     }
 }
-
-release {
-    git {
-        requireBranch.set("master")
-    }
-}
diff --git a/error-handling-core/src/main/java/com/bakdata/kafka/ErrorUtil.java b/error-handling-core/src/main/java/com/bakdata/kafka/ErrorUtil.java
@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 bakdata
+ * Copyright (c) 2024 bakdata
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -27,7 +27,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.net.SocketTimeoutException;
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;
 import lombok.experimental.UtilityClass;
@@ -42,7 +41,6 @@
 import org.apache.avro.specific.SpecificDatumWriter;
 import org.apache.avro.specific.SpecificRecord;
 import org.apache.kafka.common.errors.RecordTooLargeException;
-import org.apache.kafka.common.errors.SerializationException;
 
 /**
  * This class provides utility methods for dealing with errors in Kafka streams, such as serializing values to string
@@ -75,22 +73,14 @@ public static boolean isRecoverable(final Exception e) {
      * <p>Non-recoverable Kafka errors are:
      * <ul>
      *     <li>{@link RecordTooLargeException}
-     *     <li>{@link SerializationException} which is not caused by timeout
      * </ul>
      *
      * @param e exception
      * @return whether exception is thrown by Kafka and recoverable or not
      */
     public static boolean isRecoverableKafkaError(final Exception e) {
         if (ORG_APACHE_KAFKA_COMMON_ERRORS.equals(e.getClass().getPackageName())) {
-            if (e instanceof RecordTooLargeException) {
-                return false;
-            }
-            if (e instanceof SerializationException) {
-                // socket timeouts usually indicate that the schema registry is temporarily down
-                return e.getCause() instanceof SocketTimeoutException;
-            }
-            return true;
+            return !(e instanceof RecordTooLargeException);
         }
         return false;
     }

diff --git a/...ng-core/src/test/java/com/bakdata/kafka/ErrorCapturingFlatKeyValueMapperTopologyTest.java b/...ng-core/src/test/java/com/bakdata/kafka/ErrorCapturingFlatKeyValueMapperTopologyTest.java
@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 bakdata
+ * Copyright (c) 2024 bakdata
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -93,8 +93,8 @@ void shouldNotAllowNullFilter(final SoftAssertions softly) {
     }
 
     @Test
-    void shouldForwardSchemaRegistryTimeout(final SoftAssertions softly) {
-        when(this.mapper.apply(1, "foo")).thenThrow(createSchemaRegistryTimeoutException());
+    void shouldForwardSerializationException(final SoftAssertions softly) {
+        when(this.mapper.apply(1, "foo")).thenThrow(new SerializationException());
         this.createTopology();
         softly.assertThatThrownBy(() -> this.topology.input()
                         .withValueSerde(STRING_SERDE)

diff --git a/...dling-core/src/test/java/com/bakdata/kafka/ErrorCapturingFlatTransformerTopologyTest.java b/...dling-core/src/test/java/com/bakdata/kafka/ErrorCapturingFlatTransformerTopologyTest.java
@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 bakdata
+ * Copyright (c) 2024 bakdata
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -99,8 +99,8 @@ void shouldNotAllowNullFilter(final SoftAssertions softly) {
     }
 
     @Test
-    void shouldForwardSchemaRegistryTimeout(final SoftAssertions softly) {
-        final RuntimeException throwable = createSchemaRegistryTimeoutException();
+    void shouldForwardSerializationException(final SoftAssertions softly) {
+        final RuntimeException throwable = new SerializationException();
         this.mapper = new Transformer<>() {
             private ProcessorContext context = null;
 

diff --git a/...dling-core/src/test/java/com/bakdata/kafka/ErrorCapturingFlatValueMapperTopologyTest.java b/...dling-core/src/test/java/com/bakdata/kafka/ErrorCapturingFlatValueMapperTopologyTest.java
@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 bakdata
+ * Copyright (c) 2024 bakdata
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -94,8 +94,8 @@ void shouldNotAllowNullFilter(final SoftAssertions softly) {
     }
 
     @Test
-    void shouldForwardSchemaRegistryTimeout(final SoftAssertions softly) {
-        when(this.mapper.apply("foo")).thenThrow(createSchemaRegistryTimeoutException());
+    void shouldForwardSerializationException(final SoftAssertions softly) {
+        when(this.mapper.apply("foo")).thenThrow(new SerializationException());
         this.createTopology();
         softly.assertThatThrownBy(() -> this.topology.input()
                         .withValueSerde(STRING_SERDE)

diff --git a/...ore/src/test/java/com/bakdata/kafka/ErrorCapturingFlatValueMapperWithKeyTopologyTest.java b/...ore/src/test/java/com/bakdata/kafka/ErrorCapturingFlatValueMapperWithKeyTopologyTest.java
@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 bakdata
+ * Copyright (c) 2024 bakdata
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -92,8 +92,8 @@ void shouldNotAllowNullFilter(final SoftAssertions softly) {
     }
 
     @Test
-    void shouldForwardSchemaRegistryTimeout(final SoftAssertions softly) {
-        when(this.mapper.apply(1, "foo")).thenThrow(createSchemaRegistryTimeoutException());
+    void shouldForwardSerializationException(final SoftAssertions softly) {
+        when(this.mapper.apply(1, "foo")).thenThrow(new SerializationException());
         this.createTopology();
         softly.assertThatThrownBy(() -> this.topology.input()
                         .withValueSerde(STRING_SERDE)

diff --git a/...-core/src/test/java/com/bakdata/kafka/ErrorCapturingFlatValueTransformerTopologyTest.java b/...-core/src/test/java/com/bakdata/kafka/ErrorCapturingFlatValueTransformerTopologyTest.java
@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 bakdata
+ * Copyright (c) 2024 bakdata
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -94,8 +94,8 @@ void shouldNotAllowNullFilter(final SoftAssertions softly) {
     }
 
     @Test
-    void shouldForwardSchemaRegistryTimeout(final SoftAssertions softly) {
-        final RuntimeException throwable = createSchemaRegistryTimeoutException();
+    void shouldForwardSerializationException(final SoftAssertions softly) {
+        final RuntimeException throwable = new SerializationException();
         this.mapper = new ValueTransformer<>() {
             private ProcessorContext context = null;
 

diff --git a/...rc/test/java/com/bakdata/kafka/ErrorCapturingFlatValueTransformerWithKeyTopologyTest.java b/...rc/test/java/com/bakdata/kafka/ErrorCapturingFlatValueTransformerWithKeyTopologyTest.java
@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 bakdata
+ * Copyright (c) 2024 bakdata
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -97,8 +97,8 @@ void shouldNotAllowNullFilter(final SoftAssertions softly) {
     }
 
     @Test
-    void shouldForwardSchemaRegistryTimeout(final SoftAssertions softly) {
-        final RuntimeException throwable = createSchemaRegistryTimeoutException();
+    void shouldForwardSerializationException(final SoftAssertions softly) {
+        final RuntimeException throwable = new SerializationException();
         this.mapper = new ValueTransformerWithKey<>() {
             private ProcessorContext context = null;
 

diff --git a/...ndling-core/src/test/java/com/bakdata/kafka/ErrorCapturingKeyValueMapperTopologyTest.java b/...ndling-core/src/test/java/com/bakdata/kafka/ErrorCapturingKeyValueMapperTopologyTest.java
@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 bakdata
+ * Copyright (c) 2024 bakdata
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -93,8 +93,8 @@ void shouldNotAllowNullFilter(final SoftAssertions softly) {
     }
 
     @Test
-    void shouldForwardSchemaRegistryTimeout(final SoftAssertions softly) {
-        when(this.mapper.apply(1, "foo")).thenThrow(createSchemaRegistryTimeoutException());
+    void shouldForwardSerializationException(final SoftAssertions softly) {
+        when(this.mapper.apply(1, "foo")).thenThrow(new SerializationException());
         this.createTopology();
         softly.assertThatThrownBy(() -> this.topology.input()
                         .withValueSerde(STRING_SERDE)

diff --git a/error-handling-core/src/test/java/com/bakdata/kafka/ErrorCapturingProcessorTopologyTest.java b/error-handling-core/src/test/java/com/bakdata/kafka/ErrorCapturingProcessorTopologyTest.java
@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 bakdata
+ * Copyright (c) 2024 bakdata
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -95,8 +95,8 @@ void shouldNotAllowNullFilter(final SoftAssertions softly) {
     }
 
     @Test
-    void shouldForwardSchemaRegistryTimeout(final SoftAssertions softly) {
-        final RuntimeException throwable = createSchemaRegistryTimeoutException();
+    void shouldForwardSerializationException(final SoftAssertions softly) {
+        final RuntimeException throwable = new SerializationException();
         this.mapper = new Processor<>() {
 
             @Override

diff --git a/...-handling-core/src/test/java/com/bakdata/kafka/ErrorCapturingTransformerTopologyTest.java b/...-handling-core/src/test/java/com/bakdata/kafka/ErrorCapturingTransformerTopologyTest.java
@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 bakdata
+ * Copyright (c) 2024 bakdata
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -97,8 +97,8 @@ void shouldNotAllowNullFilter(final SoftAssertions softly) {
     }
 
     @Test
-    void shouldForwardSchemaRegistryTimeout(final SoftAssertions softly) {
-        final RuntimeException throwable = createSchemaRegistryTimeoutException();
+    void shouldForwardSerializationException(final SoftAssertions softly) {
+        final RuntimeException throwable = new SerializationException();
         this.mapper = new Transformer<>() {
             private ProcessorContext context = null;
 

diff --git a/...-handling-core/src/test/java/com/bakdata/kafka/ErrorCapturingValueMapperTopologyTest.java b/...-handling-core/src/test/java/com/bakdata/kafka/ErrorCapturingValueMapperTopologyTest.java
@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 bakdata
+ * Copyright (c) 2024 bakdata
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -91,8 +91,8 @@ void shouldNotAllowNullFilter(final SoftAssertions softly) {
     }
 
     @Test
-    void shouldForwardSchemaRegistryTimeout(final SoftAssertions softly) {
-        when(this.mapper.apply("foo")).thenThrow(createSchemaRegistryTimeoutException());
+    void shouldForwardSerializationException(final SoftAssertions softly) {
+        when(this.mapper.apply("foo")).thenThrow(new SerializationException());
         this.createTopology();
         softly.assertThatThrownBy(() -> this.topology.input()
                         .withValueSerde(STRING_SERDE)

diff --git a/...ng-core/src/test/java/com/bakdata/kafka/ErrorCapturingValueMapperWithKeyTopologyTest.java b/...ng-core/src/test/java/com/bakdata/kafka/ErrorCapturingValueMapperWithKeyTopologyTest.java
@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 bakdata
+ * Copyright (c) 2024 bakdata
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -91,8 +91,8 @@ void shouldNotAllowNullFilter(final SoftAssertions softly) {
     }
 
     @Test
-    void shouldForwardSchemaRegistryTimeout(final SoftAssertions softly) {
-        when(this.mapper.apply(1, "foo")).thenThrow(createSchemaRegistryTimeoutException());
+    void shouldForwardSerializationException(final SoftAssertions softly) {
+        when(this.mapper.apply(1, "foo")).thenThrow(new SerializationException());
         this.createTopology();
         softly.assertThatThrownBy(() -> this.topology.input()
                         .withValueSerde(STRING_SERDE)

diff --git a/...ndling-core/src/test/java/com/bakdata/kafka/ErrorCapturingValueProcessorTopologyTest.java b/...ndling-core/src/test/java/com/bakdata/kafka/ErrorCapturingValueProcessorTopologyTest.java
@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 bakdata
+ * Copyright (c) 2024 bakdata
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -95,8 +95,8 @@ void shouldNotAllowNullFilter(final SoftAssertions softly) {
     }
 
     @Test
-    void shouldForwardSchemaRegistryTimeout(final SoftAssertions softly) {
-        final RuntimeException throwable = createSchemaRegistryTimeoutException();
+    void shouldForwardSerializationException(final SoftAssertions softly) {
+        final RuntimeException throwable = new SerializationException();
         this.mapper = new FixedKeyProcessor<>() {
 
             @Override

diff --git a/...ling-core/src/test/java/com/bakdata/kafka/ErrorCapturingValueTransformerTopologyTest.java b/...ling-core/src/test/java/com/bakdata/kafka/ErrorCapturingValueTransformerTopologyTest.java
@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 bakdata
+ * Copyright (c) 2024 bakdata
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -91,8 +91,8 @@ void shouldNotAllowNullFilter(final SoftAssertions softly) {
     }
 
     @Test
-    void shouldForwardSchemaRegistryTimeout(final SoftAssertions softly) {
-        final RuntimeException throwable = createSchemaRegistryTimeoutException();
+    void shouldForwardSerializationException(final SoftAssertions softly) {
+        final RuntimeException throwable = new SerializationException();
         this.mapper = new ValueTransformer<>() {
             private ProcessorContext context = null;
 

diff --git a/...re/src/test/java/com/bakdata/kafka/ErrorCapturingValueTransformerWithKeyTopologyTest.java b/...re/src/test/java/com/bakdata/kafka/ErrorCapturingValueTransformerWithKeyTopologyTest.java
@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 bakdata
+ * Copyright (c) 2024 bakdata
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -94,8 +94,8 @@ void shouldNotAllowNullFilter(final SoftAssertions softly) {
     }
 
     @Test
-    void shouldForwardSchemaRegistryTimeout(final SoftAssertions softly) {
-        final RuntimeException throwable = createSchemaRegistryTimeoutException();
+    void shouldForwardSerializationException(final SoftAssertions softly) {
+        final RuntimeException throwable = new SerializationException();
         this.mapper = new ValueTransformerWithKey<>() {
             private ProcessorContext context = null;