Skip to content

Commit

Permalink
Merge branch 'release/0.9.125'
Browse files Browse the repository at this point in the history
  • Loading branch information
jfallows committed Feb 5, 2025
2 parents bd0981c + 96364ca commit 5e595c4
Show file tree
Hide file tree
Showing 171 changed files with 2,565 additions and 986 deletions.
24 changes: 23 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,29 @@

## [Unreleased](https://github.com/aklivity/zilla/tree/HEAD)

[Full Changelog](https://github.com/aklivity/zilla/compare/0.9.123...HEAD)
[Full Changelog](https://github.com/aklivity/zilla/compare/0.9.124...HEAD)

**Implemented enhancements:**

- Support gRPC client streaming to Kafka directly [\#642](https://github.com/aklivity/zilla/issues/642)

**Fixed bugs:**

- Zilla Crashes on invalid request payload [\#1394](https://github.com/aklivity/zilla/issues/1394)
- Schema Retrieval Failure Causes Validation Error in Zilla [\#1391](https://github.com/aklivity/zilla/issues/1391)
- Connection refused for MQTT Kafka broker after setting up TLS on the Kafka client [\#1389](https://github.com/aklivity/zilla/issues/1389)
- Zilla Validation not working correctly [\#1385](https://github.com/aklivity/zilla/issues/1385)

**Merged pull requests:**

- Use `OpenapiView` and `AsyncapiView` to generate composite namespaces [\#1396](https://github.com/aklivity/zilla/pull/1396) ([jfallows](https://github.com/jfallows))
- fix: Zilla Crashes on invalid request payload [\#1395](https://github.com/aklivity/zilla/pull/1395) ([ankitk-me](https://github.com/ankitk-me))
- fix: locale-specific formatting due to `MessageFormat.format()` [\#1390](https://github.com/aklivity/zilla/pull/1390) ([ankitk-me](https://github.com/ankitk-me))
- Support gRPC client stream/unary oneway [\#1384](https://github.com/aklivity/zilla/pull/1384) ([ankitk-me](https://github.com/ankitk-me))

## [0.9.124](https://github.com/aklivity/zilla/tree/0.9.124) (2025-01-30)

[Full Changelog](https://github.com/aklivity/zilla/compare/0.9.123...0.9.124)

**Merged pull requests:**

Expand Down
2 changes: 1 addition & 1 deletion build/flyweight-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>build</artifactId>
<version>0.9.124</version>
<version>0.9.125</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion build/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>zilla</artifactId>
<version>0.9.124</version>
<version>0.9.125</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion cloud/docker-image/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>cloud</artifactId>
<version>0.9.124</version>
<version>0.9.125</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion cloud/helm-chart/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>cloud</artifactId>
<version>0.9.124</version>
<version>0.9.125</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion cloud/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>zilla</artifactId>
<version>0.9.124</version>
<version>0.9.125</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion conf/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>zilla</artifactId>
<version>0.9.124</version>
<version>0.9.125</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion incubator/binding-amqp.spec/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>incubator</artifactId>
<version>0.9.124</version>
<version>0.9.125</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion incubator/binding-amqp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>incubator</artifactId>
<version>0.9.124</version>
<version>0.9.125</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion incubator/binding-pgsql-kafka.spec/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>incubator</artifactId>
<version>0.9.124</version>
<version>0.9.125</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion incubator/binding-pgsql-kafka/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>incubator</artifactId>
<version>0.9.124</version>
<version>0.9.125</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion incubator/binding-pgsql.spec/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>incubator</artifactId>
<version>0.9.124</version>
<version>0.9.125</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion incubator/binding-pgsql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>incubator</artifactId>
<version>0.9.124</version>
<version>0.9.125</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion incubator/binding-risingwave.spec/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>incubator</artifactId>
<version>0.9.124</version>
<version>0.9.125</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion incubator/binding-risingwave/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>incubator</artifactId>
<version>0.9.124</version>
<version>0.9.125</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion incubator/command-dump/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>incubator</artifactId>
<version>0.9.124</version>
<version>0.9.125</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion incubator/command-log/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>incubator</artifactId>
<version>0.9.124</version>
<version>0.9.125</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion incubator/command-tune/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>incubator</artifactId>
<version>0.9.124</version>
<version>0.9.125</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion incubator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>zilla</artifactId>
<version>0.9.124</version>
<version>0.9.125</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion manager/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>zilla</artifactId>
<version>0.9.124</version>
<version>0.9.125</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.aklivity.zilla</groupId>
<artifactId>zilla</artifactId>
<version>0.9.124</version>
<version>0.9.125</version>
<packaging>pom</packaging>
<name>zilla</name>
<url>https://github.com/aklivity/zilla</url>
Expand Down
2 changes: 1 addition & 1 deletion runtime/binding-asyncapi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>runtime</artifactId>
<version>0.9.124</version>
<version>0.9.125</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import static java.util.stream.Collectors.toMap;

import java.util.List;
import java.util.function.LongFunction;
import java.util.function.ToLongFunction;

import org.agrona.collections.Long2ObjectHashMap;
Expand All @@ -35,7 +34,6 @@ public final class AsyncapiCompositeConfig
public final List<AsyncapiCompositeRouteConfig> routes;
public final List<NamespaceConfig> namespaces;

private final LongFunction<String> resolveLabel;
private final ToLongFunction<String> resolveSchemaId;

private Long2ObjectHashMap<AsyncapiOperationView> operationsById;
Expand All @@ -56,10 +54,6 @@ public AsyncapiCompositeConfig(
this.routes = routes;
this.namespaces = namespaces;

final Long2ObjectHashMap<String> labelsBySchemaId = new Long2ObjectHashMap<>();
schemas.forEach(s -> labelsBySchemaId.put(s.schemaId, s.apiLabel));
this.resolveLabel = labelsBySchemaId::get;

final Object2LongHashMap<String> schemaIdsByLabel = new Object2LongHashMap<>(NO_SCHEMA_ID);
schemas.forEach(s -> schemaIdsByLabel.put(s.apiLabel, s.schemaId));
this.resolveSchemaId = schemaIdsByLabel::get;
Expand Down Expand Up @@ -93,12 +87,6 @@ public AsyncapiCompositeRouteConfig resolve(
.orElse(null);
}

public String resolveApiId(
long apiId)
{
return resolveLabel.apply(apiId);
}

public long resolveApiId(
String apiId)
{
Expand Down
2 changes: 1 addition & 1 deletion runtime/binding-echo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>runtime</artifactId>
<version>0.9.124</version>
<version>0.9.125</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion runtime/binding-fan/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>runtime</artifactId>
<version>0.9.124</version>
<version>0.9.125</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion runtime/binding-filesystem/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>runtime</artifactId>
<version>0.9.124</version>
<version>0.9.125</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion runtime/binding-grpc-kafka/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>runtime</artifactId>
<version>0.9.124</version>
<version>0.9.125</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,11 @@ public GrpcKafkaWithConfig adaptFromJson(
}
}

String newReplyTo = object.getString(REPLY_TO_NAME);
String newReplyTo = null;
if (object.containsKey(REPLY_TO_NAME))
{
newReplyTo = object.getString(REPLY_TO_NAME);
}

return new GrpcKafkaWithConfig(
new GrpcKafkaWithProduceConfig(newTopic, newProduceAcks, newProduceKey, newOverrides, newReplyTo));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,15 @@ public class GrpcKafkaWithProduceResult
this.nameBuffer = new ExpandableDirectByteBuffer();
this.nameBuffer.putStringWithoutLengthAscii(0, META_PREFIX);

hash.updateHash(correlation.service.value());
hash.updateHash(service.value());
hash.updateHash(correlation.method.value());
hash.updateHash(method.value());
hash.updateHash(correlation.replyTo.value());
hash.updateHash(replyTo.value());
if (hasReplyTo())
{
hash.updateHash(correlation.service.value());
hash.updateHash(service.value());
hash.updateHash(correlation.method.value());
hash.updateHash(method.value());
hash.updateHash(correlation.replyTo.value());
hash.updateHash(replyTo.value());
}

if (overrides != null)
{
Expand Down Expand Up @@ -153,10 +156,14 @@ public void headers(
overrides.forEach(o -> builder.item(o::header));
}

builder.item(this::service);
builder.item(this::method);
builder.item(this::replyTo);
builder.item(this::correlationId);
if (hasReplyTo())
{
builder.item(this::service);
builder.item(this::method);
builder.item(this::replyTo);
builder.item(this::correlationId);
}

metadata.forEach(m -> builder.item(i -> metadata(i, m)));
}

Expand Down Expand Up @@ -241,4 +248,9 @@ public void filters(
.valueLen(hashCorrelationId.sizeof())
.value(hashCorrelationId.value(), 0, hashCorrelationId.sizeof()))));
}

public boolean hasReplyTo()
{
return replyTo != null && replyTo.value() != null;
}
}
Loading

0 comments on commit 5e595c4

Please sign in to comment.