Ensure metadata is released

Author: rdegnan

gradle.properties

@@ -1,2 +1,2 @@
 group=io.rsocket.rpc
-version=0.2.1
+version=0.2.2

gradle/java.gradle

@@ -83,11 +83,11 @@ dependencies {
     testCompile 'io.projectreactor:reactor-test:3.1.9.RELEASE'
     testCompile 'com.google.protobuf:protobuf-java:3.6.1'
     testCompile 'org.hdrhistogram:HdrHistogram:2.1.10'
-    testCompile 'org.apache.logging.log4j:log4j-api:2.8.2'
-    testCompile 'org.apache.logging.log4j:log4j-core:2.8.2'
-    testCompile 'org.apache.logging.log4j:log4j-slf4j-impl:2.8.2'
-    testCompile 'io.rsocket:rsocket-transport-netty:0.11.6'
-    testCompile 'io.rsocket:rsocket-transport-local:0.11.6'
+    testCompile 'org.apache.logging.log4j:log4j-api:2.9.0'
+    testCompile 'org.apache.logging.log4j:log4j-core:2.9.0'
+    testCompile 'org.apache.logging.log4j:log4j-slf4j-impl:2.9.0'
+    testCompile 'io.rsocket:rsocket-transport-netty:0.11.7'
+    testCompile 'io.rsocket:rsocket-transport-local:0.11.7'
     testCompile 'org.mockito:mockito-all:1.10.19'
 }
 

rsocket-rpc-core/build.gradle

@@ -10,8 +10,8 @@ dependencies {
     compile 'io.opentracing:opentracing-api:0.31.0'
     compile 'javax.inject:javax.inject:1'
     compile 'com.google.protobuf:protobuf-java:3.6.1'
-    compile 'io.rsocket:rsocket-core:0.11.6'
-    compile 'io.rsocket:rsocket-transport-netty:0.11.6'
+    compile 'io.rsocket:rsocket-core:0.11.7'
+    compile 'io.rsocket:rsocket-transport-netty:0.11.7'
     compile 'io.micrometer:micrometer-core:1.0.6'
 
     protobuf project(':rsocket-rpc-metrics-idl')

rsocket-rpc-core/src/main/java/io/rsocket/rpc/frames/Metadata.java

@@ -33,7 +33,7 @@ public static ByteBuf encode(
     ByteBufUtil.reserveAndWriteUtf8(byteBuf, method, methodLength);
 
     byteBuf.writeShort(tracing.readableBytes());
-    byteBuf.writeBytes(tracing);
+    byteBuf.writeBytes(tracing, tracing.readerIndex(), tracing.readableBytes());
 
     byteBuf.writeBytes(metadata, metadata.readerIndex(), metadata.readableBytes());
 

rsocket-rpc-protobuf/src/java_plugin/cpp/java_generator.cpp

@@ -741,10 +741,11 @@ static void PrintClient(const ServiceDescriptor* service,
         p->Indent();
         p->Print(
             *vars,
-            "final $ByteBuf$ tracingMetadata = $RSocketRpcTracing$.mapToByteBuf($ByteBufAllocator$.DEFAULT, map);\n"
-            "final $ByteBuf$ metadataBuf = $RSocketRpcMetadata$.encode($ByteBufAllocator$.DEFAULT, $service_name$.$service_field_name$, $service_name$.$method_field_name$, tracingMetadata, metadata);\n"
-            "$ByteBuf$ data = serialize(message);\n"
-            "tracingMetadata.release();\n"
+            "final $ByteBuf$ data = serialize(message);\n"
+            "final $ByteBuf$ tracing = $RSocketRpcTracing$.mapToByteBuf($ByteBufAllocator$.DEFAULT, map);\n"
+            "final $ByteBuf$ metadataBuf = $RSocketRpcMetadata$.encode($ByteBufAllocator$.DEFAULT, $service_name$.$service_field_name$, $service_name$.$method_field_name$, tracing, metadata);\n"
+            "tracing.release();\n"
+            "metadata.release();\n"
             "return rSocket.requestStream($ByteBufPayload$.create(data, metadataBuf));\n");
         p->Outdent();
         p->Print("}\n");
@@ -765,10 +766,11 @@ static void PrintClient(const ServiceDescriptor* service,
           p->Indent();
           p->Print(
               *vars,
-              "final $ByteBuf$ tracingMetadata = $RSocketRpcTracing$.mapToByteBuf($ByteBufAllocator$.DEFAULT, map);\n"
-              "final $ByteBuf$ metadataBuf = $RSocketRpcMetadata$.encode($ByteBufAllocator$.DEFAULT, $service_name$.$service_field_name$, $service_name$.$method_field_name$, tracingMetadata, metadata);\n"
-              "$ByteBuf$ data = serialize(message);\n"
-              "tracingMetadata.release();\n"
+              "final $ByteBuf$ data = serialize(message);\n"
+              "final $ByteBuf$ tracing = $RSocketRpcTracing$.mapToByteBuf($ByteBufAllocator$.DEFAULT, map);\n"
+              "final $ByteBuf$ metadataBuf = $RSocketRpcMetadata$.encode($ByteBufAllocator$.DEFAULT, $service_name$.$service_field_name$, $service_name$.$method_field_name$, tracing, metadata);\n"
+              "tracing.release();\n"
+              "metadata.release();\n"
               "return rSocket.fireAndForget($ByteBufPayload$.create(data, metadataBuf));\n");
           p->Outdent();
           p->Print("}\n");
@@ -788,10 +790,11 @@ static void PrintClient(const ServiceDescriptor* service,
           p->Indent();
           p->Print(
               *vars,
-              "final $ByteBuf$ tracingMetadata = $RSocketRpcTracing$.mapToByteBuf($ByteBufAllocator$.DEFAULT, map);\n"
-              "final $ByteBuf$ metadataBuf = $RSocketRpcMetadata$.encode($ByteBufAllocator$.DEFAULT, $service_name$.$service_field_name$, $service_name$.$method_field_name$, tracingMetadata, metadata);\n"
-              "$ByteBuf$ data = serialize(message);\n"
-              "tracingMetadata.release();\n"
+              "final $ByteBuf$ data = serialize(message);\n"
+              "final $ByteBuf$ tracing = $RSocketRpcTracing$.mapToByteBuf($ByteBufAllocator$.DEFAULT, map);\n"
+              "final $ByteBuf$ metadataBuf = $RSocketRpcMetadata$.encode($ByteBufAllocator$.DEFAULT, $service_name$.$service_field_name$, $service_name$.$method_field_name$, tracing, metadata);\n"
+              "tracing.release();\n"
+              "metadata.release();\n"
               "return rSocket.requestResponse($ByteBufPayload$.create(data, metadataBuf));\n");
           p->Outdent();
           p->Print("}\n");