Updated subtree from https://github.com/azure/azure-functions-language-worker-protobuf. Tag: v1.3.5-protofile. Commit: a12f76345e2286ed3772ab4a9d8527af11899af2 (Azure#246)

Author: yojagad

azure-functions-language-worker-protobuf/README.md

@@ -1,6 +1,6 @@
 # Azure Functions Languge Worker Protobuf
 
-This repository contains the protobuf definition file which defines the gRPC service which is used between the Azure WebJobs Script host and the Azure Functions language workers. This repo is shared across many repos in many languages (for each worker) by using git commands.
+This repository contains the protobuf definition file which defines the gRPC service which is used between the [Azure Functions Host](https://github.com/Azure/azure-functions-host) and the Azure Functions language workers. This repo is shared across many repos in many languages (for each worker) by using git commands.
 
 To use this repo in Azure Functions language workers, follow steps below to add this repo as a subtree (*Adding This Repo*). If this repo is already embedded in a language worker repo, follow the steps to update the consumed file (*Pulling Updates*).
 
@@ -26,13 +26,24 @@ From within the Azure Functions language worker repo:
 1.	Define remote branch for cleaner git commands
     -	`git remote add proto-file https://github.com/azure/azure-functions-language-worker-protobuf.git`
     -	`git fetch proto-file`
-2.	Merge updates
-    -   `git merge -s subtree proto-file/<version branch> --squash --allow-unrelated-histories` 
-        -   You can also merge with an explicit path to subtree: `git merge -X subtree=<path in language worker repo> --squash proto-file/<version branch> --allow-unrelated-histories`
-3.	Finalize with commit
-    -	`git commit -m "Updated subtree from https://github.com/azure/azure-functions-language-worker-protobuf. Branch: <version branch>. Commit: <latest protobuf commit hash>"`
+2.	Pull a specific release tag
+    -   `git fetch proto-file refs/tags/<tag-name>`
+        -   Example: `git fetch proto-file refs/tags/v1.1.0-protofile`
+3.	Merge updates
+    -   Merge with an explicit path to subtree: `git merge -X subtree=<path in language worker repo> --squash <tag-name> --allow-unrelated-histories --strategy-option theirs`
+        -   Example: `git merge -X subtree=src/WebJobs.Script.Grpc/azure-functions-language-worker-protobuf --squash v1.1.0-protofile --allow-unrelated-histories --strategy-option theirs`
+4.	Finalize with commit
+    -	`git commit -m "Updated subtree from https://github.com/azure/azure-functions-language-worker-protobuf. Tag: <tag-name>. Commit: <commit hash>"`
     -	`git push`
-	
+
+## Releasing a Language Worker Protobuf version
+
+1.	Draft a release in the GitHub UI
+    -   Be sure to inculde details of the release
+2.	Create a release version, following semantic versioning guidelines ([semver.org](https://semver.org/))
+3.	Tag the version with the pattern: `v<M>.<m>.<p>-protofile` (example: `v1.1.0-protofile`)
+3.	Merge `dev` to `master`
+
 ## Consuming FunctionRPC.proto
 *Note: Update versionNumber before running following commands*
 

azure-functions-language-worker-protobuf/src/proto/FunctionRpc.proto

@@ -237,6 +237,9 @@ message RpcFunctionMetadata {
 
   // Bindings info
   map<string, BindingInfo> bindings = 6;
+
+  // Is set to true for proxy
+  bool is_proxy = 7;
 }
 
 // Host requests worker to invoke a Function
@@ -252,6 +255,21 @@ message InvocationRequest {
 
   // binding metadata from trigger
   map<string, TypedData> trigger_metadata = 4;
+
+  // Populates activityId, tracestate and tags from host
+  RpcTraceContext trace_context = 5;
+}
+
+// Host sends ActivityId, traceStateString and Tags from host
+message RpcTraceContext {
+	// This corresponds to Activity.Current?.Id
+	string trace_parent = 1;
+
+	// This corresponds to Activity.Current?.TraceStateString
+	string trace_state = 2;
+
+	// This corresponds to Activity.Current?.Tags
+	map<string, string> attributes = 3;
 }
 
 // Host requests worker to cancel invocation
@@ -286,11 +304,35 @@ message TypedData {
     bytes bytes = 3;
     bytes stream = 4;
     RpcHttp http = 5;
-	  sint64 int = 6;
+    sint64 int = 6;
     double double = 7;
+    CollectionBytes collection_bytes = 8;
+    CollectionString collection_string = 9;
+    CollectionDouble collection_double = 10;
+    CollectionSInt64 collection_sint64 = 11;
   }
 }
 
+// Used to encapsulate collection string
+message CollectionString {
+  repeated string string = 1;
+}
+
+// Used to encapsulate collection bytes
+message CollectionBytes {
+  repeated bytes bytes = 1;
+}
+
+// Used to encapsulate collection double
+message CollectionDouble {
+  repeated double double = 1;
+}
+
+// Used to encapsulate collection sint64
+message CollectionSInt64 {
+  repeated sint64 sint64 = 1;
+}
+
 // Used to describe a given binding on invocation
 message ParameterBinding {
   // Name for the binding
@@ -341,6 +383,12 @@ message RpcLog {
     None = 6;
   }
 
+  // Category of the log. Defaults to User if not specified.
+  enum RpcLogCategory {
+	User = 0;
+	System = 1;
+  }
+
   // Unique id for invocation (if exists)
   string invocation_id = 1;
 
@@ -362,6 +410,9 @@ message RpcLog {
 
   // json serialized property bag, or could use a type scheme like map<string, TypedData>
   string properties = 7;
+
+  // Category of the log. Either user(default) or system.
+  RpcLogCategory log_category = 8;
 }
 
 // Encapsulates an Exception 
@@ -372,7 +423,7 @@ message RpcException {
   // Stack trace for the exception
   string stack_trace = 1;
 
-  // Textual message describing hte exception
+  // Textual message describing the exception
   string message = 2;
 }
 

azure-functions-language-worker-protobuf/src/proto/identity/ClaimsIdentityRpc.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
 // protobuf vscode extension: https://marketplace.visualstudio.com/items?itemName=zxh404.vscode-proto3
 
+option java_package = "com.microsoft.azure.functions.rpc.messages";
+
 import "shared/NullableTypes.proto";
 
 // Light-weight representation of a .NET System.Security.Claims.ClaimsIdentity object.

azure-functions-language-worker-protobuf/src/proto/shared/NullableTypes.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
 // protobuf vscode extension: https://marketplace.visualstudio.com/items?itemName=zxh404.vscode-proto3
 
+option java_package = "com.microsoft.azure.functions.rpc.messages";
+
 import "google/protobuf/timestamp.proto";
 
 message NullableString {