Merge branch 'release/0.9.73'

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [0.9.72](https://github.com/aklivity/zilla/tree/0.9.72) (2024-03-17)
+
+[Full Changelog](https://github.com/aklivity/zilla/compare/0.9.71...0.9.72)
+
+**Merged pull requests:**
+
+- Log http access event before validation in both http/1.1 and h2 [\#856](https://github.com/aklivity/zilla/pull/856) ([jfallows](https://github.com/jfallows))
+- Fail when failed to acquire budget index [\#855](https://github.com/aklivity/zilla/pull/855) ([bmaidics](https://github.com/bmaidics))
+- Conditionally release buffer slot on clean up [\#854](https://github.com/aklivity/zilla/pull/854) ([akrambek](https://github.com/akrambek))
+- Fix exporter-otlp schema [\#852](https://github.com/aklivity/zilla/pull/852) ([attilakreiner](https://github.com/attilakreiner))
+
 ## [0.9.71](https://github.com/aklivity/zilla/tree/0.9.71) (2024-03-15)
 
 [Full Changelog](https://github.com/aklivity/zilla/compare/0.9.70...0.9.71)

build/flyweight-maven-plugin/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>build</artifactId>
-    <version>0.9.72</version>
+    <version>0.9.73</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

build/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>zilla</artifactId>
-    <version>0.9.72</version>
+    <version>0.9.73</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

cloud/docker-image/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>cloud</artifactId>
-    <version>0.9.72</version>
+    <version>0.9.73</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

cloud/helm-chart/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>cloud</artifactId>
-    <version>0.9.72</version>
+    <version>0.9.73</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

cloud/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>zilla</artifactId>
-    <version>0.9.72</version>
+    <version>0.9.73</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

conf/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>zilla</artifactId>
-    <version>0.9.72</version>
+    <version>0.9.73</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

incubator/binding-amqp.spec/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.72</version>
+    <version>0.9.73</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

incubator/binding-amqp/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.72</version>
+    <version>0.9.73</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

incubator/binding-asyncapi.spec/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.72</version>
+    <version>0.9.73</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

incubator/binding-asyncapi.spec/src/main/scripts/io/aklivity/zilla/specs/binding/asyncapi/config/client.kafka.yaml

@@ -16,10 +16,14 @@
 
 ---
 name: test
+vaults:
+  test0:
+    type: test
 bindings:
   asyncapi0:
     type: asyncapi
     kind: client
+    vault: test0
     options:
       specs:
         kafka_api: kafka/asyncapi.yaml

incubator/binding-asyncapi/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.72</version>
+    <version>0.9.73</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

incubator/binding-asyncapi/src/main/java/io/aklivity/zilla/runtime/binding/asyncapi/internal/AsyncapiClientCompositeBindingAdapter.java

@@ -25,6 +25,7 @@
 
 public class AsyncapiClientCompositeBindingAdapter extends AsyncapiCompositeBindingAdapter implements CompositeBindingAdapterSpi
 {
+
     @Override
     public String type()
     {
@@ -42,7 +43,9 @@ public BindingConfig adapt(
         //TODO: add composite for all servers
         AsyncapiServerView firstServer = AsyncapiServerView.of(asyncapi.servers.entrySet().iterator().next().getValue());
         this.qname = binding.qname;
+        this.namespace = binding.namespace;
         this.qvault = binding.qvault;
+        this.vault = binding.vault;
         this.protocol = resolveProtocol(firstServer.protocol(), options);
         this.isTlsEnabled = protocol.isSecure();
 
@@ -81,7 +84,7 @@ private <C> NamespaceConfigBuilder<C> injectTlsClient(
                     .type("tls")
                     .kind(CLIENT)
                     .options(options.tls)
-                    .vault(qvault)
+                    .vault(String.format("%s:%s", this.namespace, vault))
                     .exit("tcp_client0")
                     .build();
         }

incubator/binding-asyncapi/src/main/java/io/aklivity/zilla/runtime/binding/asyncapi/internal/AsyncapiCompositeBindingAdapter.java

@@ -50,8 +50,9 @@ public class AsyncapiCompositeBindingAdapter
     protected boolean isTlsEnabled;
     protected AsyncapiProtocol protocol;
     protected String qname;
+    protected String namespace;
     protected String qvault;
-
+    protected String vault;
 
     protected AsyncapiProtocol resolveProtocol(
         String protocolName,

incubator/binding-asyncapi/src/main/java/io/aklivity/zilla/runtime/binding/asyncapi/internal/AsyncapiHttpProtocol.java

@@ -70,7 +70,7 @@ protected AsyncapiHttpProtocol(
         this.authorizationHeader = resolveAuthorizationHeader();
         this.isJwtEnabled = !securitySchemes.isEmpty();
         final HttpOptionsConfig httpOptions = options.http;
-        this.guardName = httpOptions != null ? httpOptions.authorization.name : null;
+        this.guardName = httpOptions != null ? String.format("%s:%s", qname, httpOptions.authorization.name) : null;
         this.authorization = httpOptions != null ?  httpOptions.authorization : null;
     }
 

incubator/binding-asyncapi/src/main/java/io/aklivity/zilla/runtime/binding/asyncapi/internal/AsyncapiServerCompositeBindingAdapter.java

@@ -129,7 +129,7 @@ private <C> NamespaceConfigBuilder<C> injectTlsServer(
                         .sni(options.tls.sni)
                         .alpn(options.tls.alpn)
                         .build()
-                    .vault(qvault)
+                    .vault(String.format("%s:%s", this.namespace, vault))
                     .exit(String.format("%s_server0", protocol.scheme))
                     .build();
         }

incubator/binding-openapi-asyncapi.spec/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.72</version>
+    <version>0.9.73</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

incubator/binding-openapi-asyncapi/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.72</version>
+    <version>0.9.73</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

incubator/binding-openapi-asyncapi/src/main/java/io/aklivity/zilla/runtime/binding/openapi/asyncapi/internal/config/OpenapiAsyncCompositeBindingAdapter.java

@@ -167,9 +167,11 @@ private <C> RouteConfigBuilder<C> injectHttpKafkaRouteWith(
                 .build());
             break;
         case "send":
+            String key = !paramNames.isEmpty() ? String.format("${params.%s}", paramNames.get(0)) : "${idempotencyKey}";
             newWith.produce(HttpKafkaWithProduceConfig.builder()
                 .topic(address)
                 .acks("in_sync_replicas")
+                .key(key)
                 .build());
             break;
         }
@@ -190,7 +192,7 @@ private <C> HttpKafkaWithFetchConfigBuilder<C> injectHttpKafkaRouteFetchWith(
         {
             OpenapiSchemaView schema = resolveSchemaForJsonContentType(response.getValue().content, openapi);
 
-            if ("array".equals(schema.getType()))
+            if (schema != null && "array".equals(schema.getType()))
             {
                 fetch.merged(HttpKafkaWithFetchMergeConfig.builder()
                     .contentType("application/json")

incubator/binding-openapi.spec/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.72</version>
+    <version>0.9.73</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

incubator/binding-openapi/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.72</version>
+    <version>0.9.73</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

incubator/binding-openapi/src/main/java/io/aklivity/zilla/runtime/binding/openapi/internal/config/OpenapiServerCompositeBindingAdapter.java

@@ -102,6 +102,7 @@ public BindingConfig adapt(
         final boolean secure = httpsPorts != null;
         final Map<String, String> securitySchemes = resolveSecuritySchemes(openApi);
         final boolean hasJwt = !securitySchemes.isEmpty();
+        final String qvault = String.format("%s:%s", binding.namespace, binding.vault);
 
         return BindingConfig.builder(binding)
             .composite()
@@ -118,7 +119,7 @@ public BindingConfig adapt(
                     .inject(b -> this.injectPlainTcpRoute(b, httpPorts, secure))
                     .inject(b -> this.injectTlsTcpRoute(b, httpsPorts, secure))
                     .build()
-                .inject(n -> this.injectTlsServer(n, tlsOption, secure))
+                .inject(n -> this.injectTlsServer(n, qvault, tlsOption, secure))
                 .binding()
                     .name("http_server0")
                     .type("http")
@@ -174,6 +175,7 @@ private <C> BindingConfigBuilder<C> injectTlsTcpRoute(
 
     private <C> NamespaceConfigBuilder<C> injectTlsServer(
         NamespaceConfigBuilder<C> namespace,
+        String vault,
         TlsOptionsConfig tls,
         boolean secure)
     {
@@ -185,7 +187,7 @@ private <C> NamespaceConfigBuilder<C> injectTlsServer(
                     .type("tls")
                     .kind(SERVER)
                     .options(tls)
-                    .vault("server")
+                    .vault(vault)
                     .exit("http_server0")
                     .build();
         }
@@ -336,7 +338,7 @@ private <C> RouteConfigBuilder<C> injectHttpServerRouteGuarded(
         Map<String, String> securitySchemes)
     {
         final List<Map<String, List<String>>> security = path.methods().get(method).security;
-        final boolean hasJwt = securitySchemes.isEmpty();
+        final boolean hasJwt = !securitySchemes.isEmpty();
 
         if (security != null)
         {

incubator/catalog-apicurio.spec/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.72</version>
+    <version>0.9.73</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

incubator/catalog-apicurio/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.72</version>
+    <version>0.9.73</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

incubator/catalog-inline.spec/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.aklivity.zilla</groupId>
         <artifactId>incubator</artifactId>
-        <version>0.9.72</version>
+        <version>0.9.73</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

incubator/catalog-inline/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.aklivity.zilla</groupId>
         <artifactId>incubator</artifactId>
-        <version>0.9.72</version>
+        <version>0.9.73</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

incubator/catalog-schema-registry.spec/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.72</version>
+    <version>0.9.73</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

incubator/catalog-schema-registry/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.72</version>
+    <version>0.9.73</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

incubator/command-dump/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.72</version>
+    <version>0.9.73</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

incubator/command-generate/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.72</version>
+    <version>0.9.73</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

incubator/command-log/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.72</version>
+    <version>0.9.73</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

incubator/command-tune/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.72</version>
+    <version>0.9.73</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

incubator/exporter-otlp.spec/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.72</version>
+    <version>0.9.73</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

incubator/exporter-otlp/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.72</version>
+    <version>0.9.73</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

incubator/exporter-stdout.spec/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.72</version>
+    <version>0.9.73</version>
     <relativePath>../pom.xml</relativePath>
   </parent>