Conforms rpc context w/ woody helper; wraps w/ hg_context loading (#185)

* Conforms rpc context w/ woody helper; wraps w/ `hg_context` loading

* Bumps woody@v1.1.1

Author: nanodirijabl

apps/hg_progressor/src/hg_progressor.erl

@@ -117,14 +117,22 @@ cleanup() ->
 
 %% Processor
 
--spec process({task_t(), encoded_args(), process()}, map(), encoded_ctx()) -> process_result().
-process({CallType, BinArgs, Process}, #{ns := NS} = Options, Ctx) ->
-    _ = set_context(Ctx),
+-spec process({task_t(), encoded_args(), process()}, hg_woody_service_wrapper:handler_opts(), encoded_ctx()) ->
+    process_result().
+process({CallType, BinArgs, Process}, #{ns := NS} = Options, BinCtx) ->
+    {WoodyContext0, OtelCtx} = woody_rpc_helper:decode_rpc_context(marshal(term, BinCtx)),
+    ok = woody_rpc_helper:attach_otel_context(OtelCtx),
     #{last_event_id := LastEventID} = Process,
     Machine = marshal(process, Process#{ns => NS}),
     Func = marshal(function, CallType),
     Args = marshal(args, {CallType, BinArgs, Machine}),
-    handle_result(hg_machine:handle_function(Func, {Args}, Options), LastEventID).
+    WoodyContext = hg_woody_service_wrapper:ensure_woody_deadline_set(WoodyContext0, Options),
+    ok = hg_context:save(hg_woody_service_wrapper:create_context(WoodyContext, Options)),
+    try
+        handle_result(hg_machine:handle_function(Func, {Args}, Options), LastEventID)
+    after
+        hg_context:cleanup()
+    end.
 
 %% Internal functions
 
@@ -188,18 +196,17 @@ handle_exception({exception, Class, Reason}) ->
     erlang:raise(Class, Reason, []).
 
 get_context() ->
-    try hg_context:load() of
-        Ctx ->
-            unmarshal(term, Ctx)
-    catch
-        _:_ ->
-            unmarshal(term, <<>>)
-    end.
-
-set_context(<<>>) ->
-    hg_context:save(hg_context:create(#{party_client => #{}}));
-set_context(BinContext) ->
-    hg_context:save(marshal(term, BinContext)).
+    WoodyContext =
+        try hg_context:load() of
+            Ctx ->
+                hg_context:get_woody_context(Ctx)
+        catch
+            Class:Reason ->
+                _ = logger:warning("Failed to load context with error class '~s' and reason: ~p", [Class, Reason]),
+                _ = logger:info("Creating empty fallback context"),
+                woody_context:new()
+        end,
+    unmarshal(term, woody_rpc_helper:encode_rpc_context(WoodyContext, otel_ctx:get_current())).
 
 %% Marshalling
 

apps/hg_proto/src/hg_woody_service_wrapper.erl

@@ -8,6 +8,10 @@
 -export([handle_function/4]).
 -export([raise/1]).
 
+%% Utils
+-export([create_context/2]).
+-export([ensure_woody_deadline_set/2]).
+
 -export_type([handler_opts/0]).
 
 -type handler_opts() :: #{
@@ -47,6 +51,7 @@ handle_function(Func, Args, WoodyContext0, #{handler := Handler} = Opts) ->
 raise(Exception) ->
     woody_error:raise(business, Exception).
 
+-spec create_context(woody_context:ctx(), handler_opts()) -> hg_context:context().
 create_context(WoodyContext, Opts) ->
     ContextOptions = #{
         woody_context => WoodyContext

rebar.config

@@ -30,7 +30,7 @@
     {cache, "2.3.3"},
     {gproc, "0.9.0"},
     {genlib, {git, "https://github.com/valitydev/genlib.git", {tag, "v1.1.0"}}},
-    {woody, {git, "https://github.com/valitydev/woody_erlang.git", {tag, "v1.1.0"}}},
+    {woody, {git, "https://github.com/valitydev/woody_erlang", {tag, "v1.1.1"}}},
     {damsel, {git, "https://github.com/valitydev/damsel.git", {tag, "v2.2.17"}}},
     {payproc_errors, {git, "https://github.com/valitydev/payproc-errors-erlang.git", {branch, "master"}}},
     {mg_proto, {git, "https://github.com/valitydev/machinegun-proto.git", {branch, "master"}}},

rebar.lock

@@ -126,8 +126,8 @@
   1},
  {<<"unicode_util_compat">>,{pkg,<<"unicode_util_compat">>,<<"0.7.1">>},2},
  {<<"woody">>,
-  {git,"https://github.com/valitydev/woody_erlang.git",
-       {ref,"cc983a9423325ba1d6a509775eb6ff7ace721539"}},
+  {git,"https://github.com/valitydev/woody_erlang",
+       {ref,"3de9a236b66807d5397b28aed42e2b1c85f36739"}},
   0}]}.
 [
 {pkg_hash,[