From a58b654b7158a66cb5670d631997051af270a028 Mon Sep 17 00:00:00 2001
From: Aleksey Kashapov <nanodirijabl@gmail.com>
Date: Thu, 4 Dec 2025 17:47:46 +0300
Subject: [PATCH 1/3] Conforms rpc context w/ machinery and woody helper

---
 apps/fistful/src/fistful.erl | 5 ++++-
 rebar.config                 | 4 ++--
 rebar.lock                   | 6 +++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/apps/fistful/src/fistful.erl b/apps/fistful/src/fistful.erl
index 5bae79fa..c1f381a6 100644
--- a/apps/fistful/src/fistful.erl
+++ b/apps/fistful/src/fistful.erl
@@ -72,7 +72,10 @@ remove(NS, ID, Backend) ->
 
 %%
 
--type handler_opts() :: _.
+-type handler_opts() :: machinery:handler_opts(#{
+    woody_ctx := woody_context:ctx(),
+    otel_ctx => otel_ctx:t()
+}).
 
 -spec init(args(_), machine(E, A), options(), handler_opts()) -> result(E, A).
 init(Args, Machine, #{handler := Handler} = Options, MachineryOptions) ->
diff --git a/rebar.config b/rebar.config
index 684f9c0a..2e581f71 100644
--- a/rebar.config
+++ b/rebar.config
@@ -32,9 +32,9 @@
     {uuid, {git, "https://github.com/okeuday/uuid.git", {branch, "master"}}},
     {scoper, {git, "https://github.com/valitydev/scoper.git", {tag, "v1.1.0"}}},
     {thrift, {git, "https://github.com/valitydev/thrift_erlang.git", {tag, "v1.0.0"}}},
-    {woody, {git, "https://github.com/valitydev/woody_erlang.git", {tag, "v1.1.0"}}},
+    {woody, {git, "https://github.com/valitydev/woody_erlang", {branch, "ft/woody-rpc-helper"}}},
     {erl_health, {git, "https://github.com/valitydev/erlang-health.git", {branch, "master"}}},
-    {machinery, {git, "https://github.com/valitydev/machinery-erlang.git", {tag, "v1.1.12"}}},
+    {machinery, {git, "https://github.com/valitydev/machinery-erlang.git", {branch, "fix/conform-rpc-context"}}},
     {damsel, {git, "https://github.com/valitydev/damsel.git", {tag, "v2.2.20"}}},
     {dmt_client, {git, "https://github.com/valitydev/dmt_client.git", {tag, "v2.0.3"}}},
     {fistful_proto, {git, "https://github.com/valitydev/fistful-proto.git", {tag, "v2.0.2"}}},
diff --git a/rebar.lock b/rebar.lock
index 7213b3fc..68bb23ba 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -71,7 +71,7 @@
   0},
  {<<"machinery">>,
   {git,"https://github.com/valitydev/machinery-erlang.git",
-       {ref,"884afadc2864cbb2d0dc532f805302d250b6e1af"}},
+       {ref,"49219e2a65d2451b8aadeb6ffe273189b3f679ee"}},
   0},
  {<<"metrics">>,{pkg,<<"metrics">>,<<"1.0.1">>},2},
  {<<"mg_proto">>,
@@ -133,8 +133,8 @@
        {ref,"adad5026cbac206718271d8f540edccd44f56256"}},
   0},
  {<<"woody">>,
-  {git,"https://github.com/valitydev/woody_erlang.git",
-       {ref,"cc983a9423325ba1d6a509775eb6ff7ace721539"}},
+  {git,"https://github.com/valitydev/woody_erlang",
+       {ref,"904b887430f8b4d78fd8a58acfe105d11287a6f7"}},
   0}]}.
 [
 {pkg_hash,[

From 98e85a4a0b42a0875e3ffd424b5f0a3e42aa1c9d Mon Sep 17 00:00:00 2001
From: Aleksey Kashapov <nanodirijabl@gmail.com>
Date: Thu, 4 Dec 2025 18:32:31 +0300
Subject: [PATCH 2/3] Bumps woody & machinery

---
 rebar.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rebar.lock b/rebar.lock
index 68bb23ba..744b591a 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -71,7 +71,7 @@
   0},
  {<<"machinery">>,
   {git,"https://github.com/valitydev/machinery-erlang.git",
-       {ref,"49219e2a65d2451b8aadeb6ffe273189b3f679ee"}},
+       {ref,"0d64b25db364589523dd5719b6f719bc6279b715"}},
   0},
  {<<"metrics">>,{pkg,<<"metrics">>,<<"1.0.1">>},2},
  {<<"mg_proto">>,
@@ -134,7 +134,7 @@
   0},
  {<<"woody">>,
   {git,"https://github.com/valitydev/woody_erlang",
-       {ref,"904b887430f8b4d78fd8a58acfe105d11287a6f7"}},
+       {ref,"43175ef5930a28c3e44ea7ad57d18665d0b8a01f"}},
   0}]}.
 [
 {pkg_hash,[

From f0fe7c6abf546bb9fbcc47dfbdd8fe409771ceb7 Mon Sep 17 00:00:00 2001
From: Aleksey Kashapov <nanodirijabl@gmail.com>
Date: Mon, 8 Dec 2025 12:49:54 +0300
Subject: [PATCH 3/3] Bumps woody@v1.1.1 machinery@v1.1.13

---
 rebar.config | 4 ++--
 rebar.lock   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rebar.config b/rebar.config
index 2e581f71..3d138435 100644
--- a/rebar.config
+++ b/rebar.config
@@ -32,9 +32,9 @@
     {uuid, {git, "https://github.com/okeuday/uuid.git", {branch, "master"}}},
     {scoper, {git, "https://github.com/valitydev/scoper.git", {tag, "v1.1.0"}}},
     {thrift, {git, "https://github.com/valitydev/thrift_erlang.git", {tag, "v1.0.0"}}},
-    {woody, {git, "https://github.com/valitydev/woody_erlang", {branch, "ft/woody-rpc-helper"}}},
+    {woody, {git, "https://github.com/valitydev/woody_erlang", {tag, "v1.1.1"}}},
     {erl_health, {git, "https://github.com/valitydev/erlang-health.git", {branch, "master"}}},
-    {machinery, {git, "https://github.com/valitydev/machinery-erlang.git", {branch, "fix/conform-rpc-context"}}},
+    {machinery, {git, "https://github.com/valitydev/machinery-erlang.git", {tag, "v1.1.13"}}},
     {damsel, {git, "https://github.com/valitydev/damsel.git", {tag, "v2.2.20"}}},
     {dmt_client, {git, "https://github.com/valitydev/dmt_client.git", {tag, "v2.0.3"}}},
     {fistful_proto, {git, "https://github.com/valitydev/fistful-proto.git", {tag, "v2.0.2"}}},
diff --git a/rebar.lock b/rebar.lock
index 744b591a..911dcb7d 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -71,7 +71,7 @@
   0},
  {<<"machinery">>,
   {git,"https://github.com/valitydev/machinery-erlang.git",
-       {ref,"0d64b25db364589523dd5719b6f719bc6279b715"}},
+       {ref,"5d28bc0acf3e963a61ae5043772a9b03d95772d8"}},
   0},
  {<<"metrics">>,{pkg,<<"metrics">>,<<"1.0.1">>},2},
  {<<"mg_proto">>,
@@ -134,7 +134,7 @@
   0},
  {<<"woody">>,
   {git,"https://github.com/valitydev/woody_erlang",
-       {ref,"43175ef5930a28c3e44ea7ad57d18665d0b8a01f"}},
+       {ref,"3de9a236b66807d5397b28aed42e2b1c85f36739"}},
   0}]}.
 [
 {pkg_hash,[