From 2b68b59eca7bd1ca18859dca38891c5ea0c90293 Mon Sep 17 00:00:00 2001 From: Stephan D Date: Thu, 11 Dec 2025 11:11:54 +0100 Subject: [PATCH 1/2] removed deprecation warnings --- .../internal/service/oracle/calculator.go | 33 ++++--------------- .../internal/service/oracle/transform.go | 12 ++----- api/proto/oracle/v1/oracle.proto | 11 ++++--- 3 files changed, 15 insertions(+), 41 deletions(-) diff --git a/api/fx/oracle/internal/service/oracle/calculator.go b/api/fx/oracle/internal/service/oracle/calculator.go index 2a0eb87..8c2e54a 100644 --- a/api/fx/oracle/internal/service/oracle/calculator.go +++ b/api/fx/oracle/internal/service/oracle/calculator.go @@ -11,7 +11,6 @@ import ( smodel "github.com/tech/sendico/pkg/model" fxv1 "github.com/tech/sendico/pkg/proto/common/fx/v1" moneyv1 "github.com/tech/sendico/pkg/proto/common/money/v1" - tracev1 "github.com/tech/sendico/pkg/proto/common/trace/v1" oraclev1 "github.com/tech/sendico/pkg/proto/oracle/v1" "go.mongodb.org/mongo-driver/bson/primitive" ) @@ -171,10 +170,13 @@ func buildQuoteMeta(meta *oraclev1.RequestMeta) *model.QuoteMeta { } trace := meta.GetTrace() qm := &model.QuoteMeta{ - RequestRef: deriveRequestRef(meta, trace), - TenantRef: meta.GetTenantRef(), - TraceRef: deriveTraceRef(meta, trace), - IdempotencyKey: deriveIdempotencyKey(meta, trace), + TenantRef: meta.GetTenantRef(), + } + + if trace != nil { + qm.RequestRef = trace.GetRequestRef() + qm.TraceRef = trace.GetTraceRef() + qm.IdempotencyKey = trace.GetIdempotencyKey() } if org := strings.TrimSpace(meta.GetOrganizationRef()); org != "" { if objID, err := primitive.ObjectIDFromHex(org); err == nil { @@ -201,24 +203,3 @@ func computeExpiry(now time.Time, ttlMs int64) (int64, error) { } return now.Add(time.Duration(ttlMs) * time.Millisecond).UnixMilli(), nil } - -func deriveRequestRef(meta *oraclev1.RequestMeta, trace *tracev1.TraceContext) string { - if trace != nil && trace.GetRequestRef() != "" { - return trace.GetRequestRef() - } - return meta.GetRequestRef() -} - -func deriveTraceRef(meta *oraclev1.RequestMeta, trace *tracev1.TraceContext) string { - if trace != nil && trace.GetTraceRef() != "" { - return trace.GetTraceRef() - } - return meta.GetTraceRef() -} - -func deriveIdempotencyKey(meta *oraclev1.RequestMeta, trace *tracev1.TraceContext) string { - if trace != nil && trace.GetIdempotencyKey() != "" { - return trace.GetIdempotencyKey() - } - return meta.GetIdempotencyKey() -} diff --git a/api/fx/oracle/internal/service/oracle/transform.go b/api/fx/oracle/internal/service/oracle/transform.go index bdc11b0..4463482 100644 --- a/api/fx/oracle/internal/service/oracle/transform.go +++ b/api/fx/oracle/internal/service/oracle/transform.go @@ -7,7 +7,6 @@ import ( smodel "github.com/tech/sendico/pkg/model" fxv1 "github.com/tech/sendico/pkg/proto/common/fx/v1" moneyv1 "github.com/tech/sendico/pkg/proto/common/money/v1" - tracev1 "github.com/tech/sendico/pkg/proto/common/trace/v1" oraclev1 "github.com/tech/sendico/pkg/proto/oracle/v1" ) @@ -16,18 +15,11 @@ func buildResponseMeta(meta *oraclev1.RequestMeta) *oraclev1.ResponseMeta { if meta == nil { return resp } - resp.RequestRef = meta.GetRequestRef() - resp.TraceRef = meta.GetTraceRef() trace := meta.GetTrace() - if trace == nil { - trace = &tracev1.TraceContext{ - RequestRef: meta.GetRequestRef(), - IdempotencyKey: meta.GetIdempotencyKey(), - TraceRef: meta.GetTraceRef(), - } + if trace != nil { + resp.Trace = trace } - resp.Trace = trace return resp } diff --git a/api/proto/oracle/v1/oracle.proto b/api/proto/oracle/v1/oracle.proto index 7ee859a..eeff33c 100644 --- a/api/proto/oracle/v1/oracle.proto +++ b/api/proto/oracle/v1/oracle.proto @@ -20,17 +20,18 @@ message RateSnapshot { } message RequestMeta { - string request_ref = 1 [deprecated = true]; + reserved 1, 4, 5; + reserved "request_ref", "idempotency_key", "trace_ref"; + string tenant_ref = 2; string organization_ref = 3; - string idempotency_key = 4 [deprecated = true]; - string trace_ref = 5 [deprecated = true]; common.trace.v1.TraceContext trace = 6; } message ResponseMeta { - string request_ref = 1 [deprecated = true]; - string trace_ref = 2 [deprecated = true]; + reserved 1, 2; + reserved "request_ref", "trace_ref"; + common.trace.v1.TraceContext trace = 3; } From 8db2f3926c2c3336d5713e4a74ef68c3a2ccef3e Mon Sep 17 00:00:00 2001 From: Stephan D Date: Thu, 11 Dec 2025 11:22:51 +0100 Subject: [PATCH 2/2] deprecation fixed --- api/fx/oracle/internal/service/oracle/math.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/api/fx/oracle/internal/service/oracle/math.go b/api/fx/oracle/internal/service/oracle/math.go index f3d9822..da1bc5a 100644 --- a/api/fx/oracle/internal/service/oracle/math.go +++ b/api/fx/oracle/internal/service/oracle/math.go @@ -3,7 +3,6 @@ package oracle import ( "math/big" "strings" - "time" "github.com/tech/sendico/fx/storage/model" "github.com/tech/sendico/pkg/decimal" @@ -61,7 +60,3 @@ func priceFromRate(rate *model.RateSnapshot, side fxv1.Side) (*big.Rat, error) { return ratFromString(priceStr) } - -func timeFromUnixMilli(ms int64) time.Time { - return time.Unix(0, ms*int64(time.Millisecond)) -}