Skip to content

Upgrade to Kafka 4.0 #288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 58 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
16cf8dc
Upgrade to Kafka 4.0
philipp94831 Mar 19, 2025
4e5f6a7
Upgrade to Java 17
philipp94831 Mar 19, 2025
60c7b2e
Merge branch 'feature/java-17' into feature/kafka-4.0
philipp94831 Mar 19, 2025
4db620c
Upgrade to Java 17
philipp94831 Mar 19, 2025
a671f06
Update
philipp94831 Mar 19, 2025
205134d
Fix AutoOffsetReset
philipp94831 Mar 19, 2025
9702bff
Fix GlobalTable test
philipp94831 Mar 19, 2025
44d12bd
Fix GlobalTable test
philipp94831 Mar 19, 2025
fbf4a1e
Update dependencies
philipp94831 Mar 19, 2025
a71794a
Update dependencies
philipp94831 Mar 19, 2025
30ec799
Merge branch 'feature/java-17' into feature/kafka-4.0
philipp94831 Mar 19, 2025
6eb422a
Update dependencies
philipp94831 Mar 19, 2025
efd7139
Update dependencies
philipp94831 Mar 19, 2025
f9b22eb
Update dependencies
philipp94831 Mar 19, 2025
47302d9
Merge remote-tracking branch 'origin/feature/kafka-4.0' into feature/…
philipp94831 Mar 19, 2025
f8e8fc1
Disable parallelism
philipp94831 Mar 19, 2025
ef1b24f
Do not use native
philipp94831 Mar 20, 2025
512029e
Revert parallelism
philipp94831 Mar 20, 2025
75bf60f
Add ConsumerGroupVerifierTest
philipp94831 Mar 20, 2025
d0f5fdf
Merge remote-tracking branch 'origin/master' into feature/java-17
philipp94831 Mar 21, 2025
51b0ab0
Merge branch 'feature/java-17' into feature/kafka-4.0
philipp94831 Mar 21, 2025
8bedc77
Update
philipp94831 Mar 21, 2025
a1fdd50
Add tests
philipp94831 Mar 21, 2025
7e3642b
Add tests for test module
philipp94831 Mar 21, 2025
564e2ea
Add tests for test module
philipp94831 Mar 21, 2025
e44619d
Add tests for test module
philipp94831 Mar 21, 2025
5724eea
Add tests for test module
philipp94831 Mar 21, 2025
cf5ea37
Add tests for test module
philipp94831 Mar 21, 2025
aedb1c3
Merge branch 'feature/test-module-tests' into feature/java-17
philipp94831 Mar 21, 2025
8cd3737
Merge branch 'feature/java-17' into feature/kafka-4.0
philipp94831 Mar 21, 2025
adfe7a1
Update
philipp94831 Mar 21, 2025
0335cb9
Update
philipp94831 Mar 21, 2025
522f307
Test new protocol
philipp94831 Mar 21, 2025
5ca7164
Test new protocol
philipp94831 Mar 21, 2025
b916965
Test new protocol
philipp94831 Mar 21, 2025
50ae132
Revert new protocol
philipp94831 Mar 24, 2025
3d931fb
Add comment on intermediate topics
philipp94831 Mar 26, 2025
6cfda7a
Handle intermediate topics
philipp94831 Mar 26, 2025
41e65a8
Handle intermediate topics
philipp94831 Mar 26, 2025
8b7bcc7
Handle intermediate topics
philipp94831 Mar 26, 2025
b456663
Merge remote-tracking branch 'origin/master' into feature/test-module…
philipp94831 Apr 17, 2025
bad135a
Merge branch 'feature/test-module-tests' into feature/java-17
philipp94831 Apr 17, 2025
056215c
Merge branch 'feature/java-17' into feature/kafka-4.0
philipp94831 Apr 17, 2025
7e22452
Merge remote-tracking branch 'origin/master' into feature/test-module…
philipp94831 May 6, 2025
f89e6a7
Update
philipp94831 May 6, 2025
40b852e
Merge branch 'feature/test-module-tests' into feature/java-17
philipp94831 May 6, 2025
ac399dc
Merge remote-tracking branch 'origin/master' into feature/java-17
philipp94831 May 7, 2025
4446307
Merge remote-tracking branch 'origin/master' into feature/java-17
philipp94831 Jun 13, 2025
a65a19a
Merge branch 'feature/java-17' into feature/kafka-4.0
philipp94831 Jun 13, 2025
2b6a146
Merge remote-tracking branch 'origin/master' into feature/java-17
philipp94831 Jun 19, 2025
df30122
Merge branch 'refs/heads/feature/java-17' into feature/kafka-4.0
philipp94831 Jun 19, 2025
aadaed6
Fix
philipp94831 Jun 19, 2025
e016dc6
Update snapshot repo
philipp94831 Jun 23, 2025
a7617ce
Merge remote-tracking branch 'origin/master' into feature/java-17
philipp94831 Jun 23, 2025
4b8e138
Merge branch 'feature/java-17' into feature/kafka-4.0
philipp94831 Jun 23, 2025
e07dad7
Merge remote-tracking branch 'origin/master' into feature/kafka-4.0
philipp94831 Jun 23, 2025
822e309
Use stable version
philipp94831 Jun 23, 2025
a596199
fIX
philipp94831 Jun 23, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ allprojects {
repositories {
mavenCentral()
maven(url = "https://packages.confluent.io/maven/")
maven(url = "https://s01.oss.sonatype.org/content/repositories/snapshots")
maven(url = "https://central.sonatype.com/repository/maven-snapshots")
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ mockito = "5.17.0"
testcontainers = "1.21.0"

[libraries]
kafka-streams-utils = { group = "com.bakdata.kafka", name = "kafka-streams-utils", version = "1.1.1" }
kafka-streams-utils = { group = "com.bakdata.kafka", name = "kafka-streams-utils", version = "1.2.0" }
kafka-tools = { group = "org.apache.kafka", name = "kafka-tools" }
kafka-streams = { group = "org.apache.kafka", name = "kafka-streams" }
kafka-clients = { group = "org.apache.kafka", name = "kafka-clients" }
Expand Down
9 changes: 9 additions & 0 deletions streams-bootstrap-cli-test/src/test/resources/log4j2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,15 @@
<Logger additivity="false" level="warn" name="org.apache.kafka.clients.admin.AdminClientConfig">
<AppenderRef ref="Console"/>
</Logger>
<Logger additivity="false" level="warn" name="org.apache.kafka.common.config.AbstractConfig">
<AppenderRef ref="Console"/>
</Logger>
<Logger additivity="false" level="warn" name="org.apache.kafka.clients.admin.internals.AdminMetadataManager">
<AppenderRef ref="Console"/>
</Logger>
<Logger additivity="false" level="warn" name="org.apache.kafka.clients.Metadata">
<AppenderRef ref="Console"/>
</Logger>
<Root level="info">
<AppenderRef ref="Console"/>
</Root>
Expand Down
9 changes: 9 additions & 0 deletions streams-bootstrap-cli/src/test/resources/log4j2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,14 @@
<Logger additivity="false" level="warn" name="org.apache.kafka.clients.admin.AdminClientConfig">
<AppenderRef ref="Console"/>
</Logger>
<Logger additivity="false" level="warn" name="org.apache.kafka.common.config.AbstractConfig">
<AppenderRef ref="Console"/>
</Logger>
<Logger additivity="false" level="warn" name="org.apache.kafka.clients.admin.internals.AdminMetadataManager">
<AppenderRef ref="Console"/>
</Logger>
<Logger additivity="false" level="warn" name="org.apache.kafka.clients.Metadata">
<AppenderRef ref="Console"/>
</Logger>
</Loggers>
</Configuration>
4 changes: 1 addition & 3 deletions streams-bootstrap-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ plugins {

dependencies {
api(libs.kafka.streams.utils)
implementation(libs.kafka.tools) {
exclude(group = "org.slf4j", module = "slf4j-reload4j")
}
implementation(libs.kafka.tools)

api(libs.kafka.streams)
api(libs.kafka.clients)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import org.apache.kafka.clients.producer.ProducerConfig;
import org.apache.kafka.common.record.CompressionType;

/**
* A {@link ProducerApp} with a corresponding {@link ProducerTopicConfig}
Expand All @@ -50,7 +51,7 @@ private static Map<String, Object> createBaseConfig() {
kafkaConfig.put(ProducerConfig.ACKS_CONFIG, "all");

// compression
kafkaConfig.put(ProducerConfig.COMPRESSION_TYPE_CONFIG, "gzip");
kafkaConfig.put(ProducerConfig.COMPRESSION_TYPE_CONFIG, CompressionType.GZIP.toString());

return kafkaConfig;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import org.apache.kafka.clients.producer.ProducerConfig;
import org.apache.kafka.common.record.CompressionType;
import org.apache.kafka.streams.StreamsConfig;
import org.apache.kafka.streams.Topology;

Expand All @@ -54,7 +55,8 @@ private static Map<String, Object> createBaseConfig() {
kafkaConfig.put(StreamsConfig.producerPrefix(ProducerConfig.ACKS_CONFIG), "all");

// compression
kafkaConfig.put(StreamsConfig.producerPrefix(ProducerConfig.COMPRESSION_TYPE_CONFIG), "gzip");
kafkaConfig.put(StreamsConfig.producerPrefix(ProducerConfig.COMPRESSION_TYPE_CONFIG),
CompressionType.GZIP.toString());

return kafkaConfig;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@

import java.util.function.Function;
import org.apache.kafka.common.serialization.Serde;
import org.apache.kafka.streams.Topology.AutoOffsetReset;
import org.apache.kafka.streams.AutoOffsetReset;
import org.apache.kafka.streams.Topology;
import org.apache.kafka.streams.kstream.Consumed;
import org.apache.kafka.streams.processor.TimestampExtractor;

Expand Down Expand Up @@ -109,6 +110,14 @@ public static <K, V> ConsumedX<K, V> with(final TimestampExtractor timestampExtr
return new ConsumedX<>(configurator -> Consumed.with(timestampExtractor));
}

/**
* @see Consumed#with(Topology.AutoOffsetReset)
*/
@Deprecated(since = "5.0.0")
public static <K, V> ConsumedX<K, V> with(final Topology.AutoOffsetReset resetPolicy) {
return new ConsumedX<>(configurator -> Consumed.with(resetPolicy));
}

/**
* @see Consumed#with(AutoOffsetReset)
*/
Expand Down Expand Up @@ -159,6 +168,14 @@ public ConsumedX<K, V> withOffsetResetPolicy(final AutoOffsetReset offsetResetPo
return this.modify(consumed -> consumed.withOffsetResetPolicy(offsetResetPolicy));
}

/**
* @see Consumed#withOffsetResetPolicy(Topology.AutoOffsetReset)
*/
@Deprecated(since = "5.0.0")
public ConsumedX<K, V> withOffsetResetPolicy(final Topology.AutoOffsetReset offsetResetPolicy) {
return this.modify(consumed -> consumed.withOffsetResetPolicy(offsetResetPolicy));
}

/**
* @see Consumed#withTimestampExtractor(TimestampExtractor)
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,10 @@
import org.apache.kafka.streams.kstream.Produced;
import org.apache.kafka.streams.kstream.Repartitioned;
import org.apache.kafka.streams.kstream.StreamJoined;
import org.apache.kafka.streams.kstream.TransformerSupplier;
import org.apache.kafka.streams.kstream.ValueJoiner;
import org.apache.kafka.streams.kstream.ValueJoinerWithKey;
import org.apache.kafka.streams.kstream.ValueMapper;
import org.apache.kafka.streams.kstream.ValueMapperWithKey;
import org.apache.kafka.streams.kstream.ValueTransformerSupplier;
import org.apache.kafka.streams.kstream.ValueTransformerWithKeySupplier;
import org.apache.kafka.streams.processor.TopicNameExtractor;
import org.apache.kafka.streams.processor.api.FixedKeyProcessorSupplier;
import org.apache.kafka.streams.processor.api.ProcessorSupplier;
Expand Down Expand Up @@ -479,14 +476,6 @@ <VR> KErrorStreamX<K, V, K, VR> flatMapValuesCapturingErrors(
@Override
KStreamX<K, V> peek(ForeachAction<? super K, ? super V> action, Named named);

@Deprecated
@Override
KStreamX<K, V>[] branch(Named named, Predicate<? super K, ? super V>... predicates);

@Deprecated
@Override
KStreamX<K, V>[] branch(Predicate<? super K, ? super V>... predicates);

@Override
BranchedKStreamX<K, V> split();

Expand All @@ -499,14 +488,6 @@ <VR> KErrorStreamX<K, V, K, VR> flatMapValuesCapturingErrors(
@Override
KStreamX<K, V> merge(KStream<K, V> stream, Named named);

@Deprecated
@Override
KStreamX<K, V> through(String topic);

@Deprecated
@Override
KStreamX<K, V> through(String topic, Produced<K, V> produced);

@Override
KStreamX<K, V> repartition();

Expand Down Expand Up @@ -833,78 +814,6 @@ <GK, GV, RV> KStreamX<K, RV> leftJoin(GlobalKTable<GK, GV> globalTable,
KeyValueMapper<? super K, ? super V, ? extends GK> keySelector,
ValueJoinerWithKey<? super K, ? super V, ? super GV, ? extends RV> valueJoiner, Named named);

@Deprecated
@Override
<K1, V1> KStreamX<K1, V1> transform(
TransformerSupplier<? super K, ? super V, KeyValue<K1, V1>> transformerSupplier,
String... stateStoreNames);

@Deprecated
@Override
<K1, V1> KStreamX<K1, V1> transform(
TransformerSupplier<? super K, ? super V, KeyValue<K1, V1>> transformerSupplier,
Named named, String... stateStoreNames);

@Deprecated
@Override
<K1, V1> KStreamX<K1, V1> flatTransform(
TransformerSupplier<? super K, ? super V, Iterable<KeyValue<K1, V1>>> transformerSupplier,
String... stateStoreNames);

@Deprecated
@Override
<K1, V1> KStreamX<K1, V1> flatTransform(
TransformerSupplier<? super K, ? super V, Iterable<KeyValue<K1, V1>>> transformerSupplier, Named named,
String... stateStoreNames);

@Deprecated
@Override
<VR> KStreamX<K, VR> transformValues(
ValueTransformerSupplier<? super V, ? extends VR> valueTransformerSupplier,
String... stateStoreNames);

@Deprecated
@Override
<VR> KStreamX<K, VR> transformValues(
ValueTransformerSupplier<? super V, ? extends VR> valueTransformerSupplier,
Named named, String... stateStoreNames);

@Deprecated
@Override
<VR> KStreamX<K, VR> transformValues(
ValueTransformerWithKeySupplier<? super K, ? super V, ? extends VR> valueTransformerSupplier,
String... stateStoreNames);

@Deprecated
@Override
<VR> KStreamX<K, VR> transformValues(
ValueTransformerWithKeySupplier<? super K, ? super V, ? extends VR> valueTransformerSupplier, Named named,
String... stateStoreNames);

@Deprecated
@Override
<VR> KStreamX<K, VR> flatTransformValues(
ValueTransformerSupplier<? super V, Iterable<VR>> valueTransformerSupplier,
String... stateStoreNames);

@Deprecated
@Override
<VR> KStreamX<K, VR> flatTransformValues(
ValueTransformerSupplier<? super V, Iterable<VR>> valueTransformerSupplier,
Named named, String... stateStoreNames);

@Deprecated
@Override
<VR> KStreamX<K, VR> flatTransformValues(
ValueTransformerWithKeySupplier<? super K, ? super V, Iterable<VR>> valueTransformerSupplier,
String... stateStoreNames);

@Deprecated
@Override
<VR> KStreamX<K, VR> flatTransformValues(
ValueTransformerWithKeySupplier<? super K, ? super V, Iterable<VR>> valueTransformerSupplier, Named named,
String... stateStoreNames);

@Override
<KOut, VOut> KStreamX<KOut, VOut> process(
ProcessorSupplier<? super K, ? super V, KOut, VOut> processorSupplier,
Expand Down
Loading
Loading