Merge branch 'release/0.9.86'

aklivity · Jul 10, 2024 · 6fdcea0 · 6fdcea0
2 parents 9fa3e70 + bea68ba
commit 6fdcea0
Show file tree

Hide file tree

Showing 108 changed files with 138 additions and 124 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,8 @@
 # Changelog
 
-## [Unreleased](https://github.com/aklivity/zilla/tree/HEAD)
+## [0.9.85](https://github.com/aklivity/zilla/tree/0.9.85) (2024-07-10)
 
-[Full Changelog](https://github.com/aklivity/zilla/compare/0.9.84...HEAD)
+[Full Changelog](https://github.com/aklivity/zilla/compare/0.9.84...0.9.85)
 
 **Implemented enhancements:**
 
@@ -17,6 +17,20 @@
 
 - Add more context to the Kafka API event code log formatter. [\#1126](https://github.com/aklivity/zilla/issues/1126)
 
+**Merged pull requests:**
+
+- Ensure SASL handshake occurs for JoinGroupRequest as needed… [\#1139](https://github.com/aklivity/zilla/pull/1139) ([jfallows](https://github.com/jfallows))
+- Add CatalogConfig.builder\(\) methods [\#1133](https://github.com/aklivity/zilla/pull/1133) ([jfallows](https://github.com/jfallows))
+- Lint helm chart on local builds and PR builds [\#1132](https://github.com/aklivity/zilla/pull/1132) ([jfallows](https://github.com/jfallows))
+- fix: Add custom pod labels and fix notes for connection instructions [\#1130](https://github.com/aklivity/zilla/pull/1130) ([vordimous](https://github.com/vordimous))
+- Detect missing events in test exporter [\#1128](https://github.com/aklivity/zilla/pull/1128) ([jfallows](https://github.com/jfallows))
+- Enhance Kafka event descriptions [\#1127](https://github.com/aklivity/zilla/pull/1127) ([jfallows](https://github.com/jfallows))
+- Bug fixes and improvements to support asyncapi http, sse, and kafka integration [\#1124](https://github.com/aklivity/zilla/pull/1124) ([akrambek](https://github.com/akrambek))
+- Add zilla version command [\#1121](https://github.com/aklivity/zilla/pull/1121) ([bmaidics](https://github.com/bmaidics))
+- Support reentrant kafka write key for converter [\#1120](https://github.com/aklivity/zilla/pull/1120) ([jfallows](https://github.com/jfallows))
+- Enhance TLS key pair verification tests [\#1119](https://github.com/aklivity/zilla/pull/1119) ([jfallows](https://github.com/jfallows))
+- Bump alpine from 3.20.0 to 3.20.1 in /cloud/docker-image/src/main/docker [\#1102](https://github.com/aklivity/zilla/pull/1102) ([dependabot[bot]](https://github.com/apps/dependabot))
+
 ## [0.9.84](https://github.com/aklivity/zilla/tree/0.9.84) (2024-06-29)
 
 [Full Changelog](https://github.com/aklivity/zilla/compare/0.9.83...0.9.84)

diff --git a/build/flyweight-maven-plugin/pom.xml b/build/flyweight-maven-plugin/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>build</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/build/pom.xml b/build/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>zilla</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cloud/docker-image/pom.xml b/cloud/docker-image/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>cloud</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cloud/helm-chart/pom.xml b/cloud/helm-chart/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>cloud</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cloud/pom.xml b/cloud/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>zilla</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/conf/pom.xml b/conf/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>zilla</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/incubator/binding-amqp.spec/pom.xml b/incubator/binding-amqp.spec/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/incubator/binding-amqp/pom.xml b/incubator/binding-amqp/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/incubator/command-dump/pom.xml b/incubator/command-dump/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/incubator/command-log/pom.xml b/incubator/command-log/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/incubator/command-tune/pom.xml b/incubator/command-tune/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/incubator/pom.xml b/incubator/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>zilla</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/manager/pom.xml b/manager/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>zilla</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.aklivity.zilla</groupId>
   <artifactId>zilla</artifactId>
-  <version>0.9.85</version>
+  <version>0.9.86</version>
   <packaging>pom</packaging>
   <name>zilla</name>
   <url>https://github.com/aklivity/zilla</url>

diff --git a/runtime/binding-asyncapi/pom.xml b/runtime/binding-asyncapi/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>runtime</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/runtime/binding-echo/pom.xml b/runtime/binding-echo/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>runtime</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/runtime/binding-fan/pom.xml b/runtime/binding-fan/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>runtime</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/runtime/binding-filesystem/pom.xml b/runtime/binding-filesystem/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>runtime</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/runtime/binding-grpc-kafka/pom.xml b/runtime/binding-grpc-kafka/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>runtime</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/runtime/binding-grpc/pom.xml b/runtime/binding-grpc/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>runtime</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/runtime/binding-http-filesystem/pom.xml b/runtime/binding-http-filesystem/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>runtime</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/runtime/binding-http-kafka/pom.xml b/runtime/binding-http-kafka/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>runtime</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/runtime/binding-http/pom.xml b/runtime/binding-http/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>runtime</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/runtime/binding-kafka-grpc/pom.xml b/runtime/binding-kafka-grpc/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>runtime</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/runtime/binding-kafka/pom.xml b/runtime/binding-kafka/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>runtime</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/...main/java/io/aklivity/zilla/runtime/binding/kafka/internal/cache/KafkaCachePartition.java b/...main/java/io/aklivity/zilla/runtime/binding/kafka/internal/cache/KafkaCachePartition.java
@@ -712,7 +712,6 @@ public int writeProduceEntryStart(
         int sequence,
         KafkaAckMode ackMode,
         KafkaKeyFW key,
-        long keyHash,
         int valueLength,
         ArrayFW<KafkaHeaderFW> headers,
         int trailersSizeMax,
@@ -784,8 +783,11 @@ public int writeProduceEntryStart(
                     int keyShift = newLength.sizeof() - progress.sizeof();
                     if (keyShift > 0)
                     {
-                        logFile.readBytes(progress.limit(), octetsRO::wrap);
-                        logFile.writeBytes(newLength.limit(), octetsRO);
+                        OctetsFW octets = logFile
+                            .readBytes(progress.limit(), progress.limit() + progress.value(), octetsRO::wrap);
+                        logFile.writeBytes(newLength.limit(), octets);
+
+                        logFile.advance(keyAt + newLength.limit());
                     }
                     logFile.writeBytes(keyAt, newLength);
                     logFile.appendBytes(buffer, index, length);

diff --git a/.../aklivity/zilla/runtime/binding/kafka/internal/stream/KafkaCacheClientProduceFactory.java b/.../aklivity/zilla/runtime/binding/kafka/internal/stream/KafkaCacheClientProduceFactory.java
@@ -711,10 +711,9 @@ private void onClientInitialData(
                     assert partitionOffset >= 0 && partitionOffset >= nextOffset
                         : String.format("%d >= 0 && %d >= %d", partitionOffset, partitionOffset, nextOffset);
 
-                    final long keyHash = partition.computeKeyHash(key);
                     if (partition.writeProduceEntryStart(traceId, routedId, partitionOffset, stream.segment,
                         stream.entryMark, stream.valueMark, stream.valueLimit, timestamp, stream.initialId,
-                        producerId, producerEpoch, sequence, ackMode, key, keyHash, valueLength,
+                        producerId, producerEpoch, sequence, ackMode, key, valueLength,
                         headers, trailersSizeMax, valueFragment, convertKey, convertValue) == -1)
                     {
                         error = ERROR_INVALID_RECORD;
@@ -791,10 +790,9 @@ private void onClientInitialFlush(
                 assert partitionOffset >= 0 && partitionOffset >= nextOffset
                     : String.format("%d >= 0 && %d >= %d", partitionOffset, partitionOffset, nextOffset);
 
-                final long keyHash = partition.computeKeyHash(EMPTY_KEY);
                 partition.writeProduceEntryStart(traceId, routedId, partitionOffset, stream.segment, stream.entryMark,
                     stream.valueMark, stream.valueLimit, now().toEpochMilli(), stream.initialId, PRODUCE_FLUSH_PRODUCER_ID,
-                    PRODUCE_FLUSH_PRODUCER_EPOCH, PRODUCE_FLUSH_SEQUENCE, KafkaAckMode.LEADER_ONLY, EMPTY_KEY, keyHash,
+                    PRODUCE_FLUSH_PRODUCER_EPOCH, PRODUCE_FLUSH_SEQUENCE, KafkaAckMode.LEADER_ONLY, EMPTY_KEY,
                     0, EMPTY_TRAILERS, trailersSizeMax, EMPTY_OCTETS, convertKey, convertValue);
                 stream.partitionOffset = partitionOffset;
                 partitionOffset++;

diff --git a/runtime/binding-mqtt-kafka/pom.xml b/runtime/binding-mqtt-kafka/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>runtime</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/runtime/binding-mqtt/pom.xml b/runtime/binding-mqtt/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>runtime</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/runtime/binding-openapi-asyncapi/pom.xml b/runtime/binding-openapi-asyncapi/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>runtime</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/runtime/binding-openapi/pom.xml b/runtime/binding-openapi/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>runtime</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/runtime/binding-proxy/pom.xml b/runtime/binding-proxy/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>runtime</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/runtime/binding-sse-kafka/pom.xml b/runtime/binding-sse-kafka/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>runtime</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/runtime/binding-sse/pom.xml b/runtime/binding-sse/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>runtime</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/runtime/binding-tcp/pom.xml b/runtime/binding-tcp/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>runtime</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/runtime/binding-tls/pom.xml b/runtime/binding-tls/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>runtime</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/runtime/binding-ws/pom.xml b/runtime/binding-ws/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>runtime</artifactId>
-    <version>0.9.85</version>
+    <version>0.9.86</version>
     <relativePath>../pom.xml</relativePath>
   </parent>