Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/go-combined-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
filter_paths: '["components/crm", "components/ledger"]'
path_level: 2
app_name_prefix: "midaz"
go_version: "1.25.9"
go_version: "1.26.3"
golangci_lint_version: "v2.4.0"
golangci_lint_args: "--timeout=5m"
coverage_threshold: 85
Expand Down
2 changes: 1 addition & 1 deletion components/crm/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ OTEL_LIBRARY_NAME=github.com/LerianStudio/midaz/v3/components/crm
OTEL_RESOURCE_SERVICE_VERSION=${VERSION}
OTEL_RESOURCE_DEPLOYMENT_ENVIRONMENT=${ENV_NAME}
OTEL_EXPORTER_OTLP_ENDPOINT_PORT=4317
OTEL_EXPORTER_OTLP_ENDPOINT=otlp://midaz-otel-lgtm:${OTEL_EXPORTER_OTLP_ENDPOINT_PORT}
OTEL_EXPORTER_OTLP_ENDPOINT=http://midaz-otel-lgtm:${OTEL_EXPORTER_OTLP_ENDPOINT_PORT}
ENABLE_TELEMETRY=false

# DATA SECURITY
Expand Down
4 changes: 2 additions & 2 deletions components/crm/cmd/app/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"strings"

libCommons "github.com/LerianStudio/lib-commons/v5/commons"
libLog "github.com/LerianStudio/lib-commons/v5/commons/log"
libZap "github.com/LerianStudio/lib-commons/v5/commons/zap"
libLog "github.com/LerianStudio/lib-observability/log"
libZap "github.com/LerianStudio/lib-observability/zap"
"github.com/LerianStudio/midaz/v3/components/crm/internal/bootstrap"
)

Expand Down
17 changes: 9 additions & 8 deletions components/crm/internal/adapters/http/in/alias.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ import (
"github.com/LerianStudio/midaz/v3/pkg/net/http"

libCommons "github.com/LerianStudio/lib-commons/v5/commons"
libLog "github.com/LerianStudio/lib-commons/v5/commons/log"
libOpenTelemetry "github.com/LerianStudio/lib-commons/v5/commons/opentelemetry"
libObservability "github.com/LerianStudio/lib-observability"
libLog "github.com/LerianStudio/lib-observability/log"
libOpenTelemetry "github.com/LerianStudio/lib-observability/tracing"
"github.com/gofiber/fiber/v2"
"github.com/google/uuid"
"go.opentelemetry.io/otel/attribute"
Expand Down Expand Up @@ -43,7 +44,7 @@ type AliasHandler struct {
func (handler *AliasHandler) CreateAlias(p any, c *fiber.Ctx) error {
ctx := c.UserContext()

logger, tracer, reqId, _ := libCommons.NewTrackingFromContext(ctx)
logger, tracer, reqId, _ := libObservability.NewTrackingFromContext(ctx)

ctx, span := tracer.Start(ctx, "handler.create_alias")
defer span.End()
Expand Down Expand Up @@ -97,7 +98,7 @@ func (handler *AliasHandler) CreateAlias(p any, c *fiber.Ctx) error {
func (handler *AliasHandler) GetAliasByID(c *fiber.Ctx) error {
ctx := c.UserContext()

logger, tracer, reqId, _ := libCommons.NewTrackingFromContext(ctx)
logger, tracer, reqId, _ := libObservability.NewTrackingFromContext(ctx)

ctx, span := tracer.Start(ctx, "handler.get_alias_by_id")
defer span.End()
Expand Down Expand Up @@ -157,7 +158,7 @@ func (handler *AliasHandler) GetAliasByID(c *fiber.Ctx) error {
func (handler *AliasHandler) UpdateAlias(p any, c *fiber.Ctx) error {
ctx := c.UserContext()

logger, tracer, reqId, _ := libCommons.NewTrackingFromContext(ctx)
logger, tracer, reqId, _ := libObservability.NewTrackingFromContext(ctx)

ctx, span := tracer.Start(ctx, "handler.update_alias")
defer span.End()
Expand Down Expand Up @@ -232,7 +233,7 @@ func (handler *AliasHandler) UpdateAlias(p any, c *fiber.Ctx) error {
func (handler *AliasHandler) DeleteAliasByID(c *fiber.Ctx) error {
ctx := c.UserContext()

logger, tracer, reqId, _ := libCommons.NewTrackingFromContext(ctx)
logger, tracer, reqId, _ := libObservability.NewTrackingFromContext(ctx)

ctx, span := tracer.Start(ctx, "handler.remove_alias_by_id")
defer span.End()
Expand Down Expand Up @@ -303,7 +304,7 @@ func (handler *AliasHandler) DeleteAliasByID(c *fiber.Ctx) error {
func (handler *AliasHandler) GetAllAliases(c *fiber.Ctx) error {
ctx := c.UserContext()

logger, tracer, reqId, _ := libCommons.NewTrackingFromContext(ctx)
logger, tracer, reqId, _ := libObservability.NewTrackingFromContext(ctx)

ctx, span := tracer.Start(ctx, "handler.get_all_aliases")
defer span.End()
Expand Down Expand Up @@ -384,7 +385,7 @@ func (handler *AliasHandler) GetAllAliases(c *fiber.Ctx) error {
func (handler *AliasHandler) DeleteRelatedParty(c *fiber.Ctx) error {
ctx := c.UserContext()

logger, tracer, reqId, _ := libCommons.NewTrackingFromContext(ctx)
logger, tracer, reqId, _ := libObservability.NewTrackingFromContext(ctx)

ctx, span := tracer.Start(ctx, "handler.delete_related_party")
defer span.End()
Expand Down
6 changes: 3 additions & 3 deletions components/crm/internal/adapters/http/in/holder.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"github.com/LerianStudio/midaz/v3/pkg/mmodel"
"github.com/LerianStudio/midaz/v3/pkg/net/http"

libCommons "github.com/LerianStudio/lib-commons/v5/commons"
libLog "github.com/LerianStudio/lib-commons/v5/commons/log"
libOpenTelemetry "github.com/LerianStudio/lib-commons/v5/commons/opentelemetry"
libCommons "github.com/LerianStudio/lib-observability"
libLog "github.com/LerianStudio/lib-observability/log"
libOpenTelemetry "github.com/LerianStudio/lib-observability/tracing"
"github.com/gofiber/fiber/v2"
"go.opentelemetry.io/otel/attribute"
)
Expand Down
9 changes: 5 additions & 4 deletions components/crm/internal/adapters/http/in/routes.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ import (
"github.com/LerianStudio/midaz/v3/pkg/net/http"

"github.com/LerianStudio/lib-auth/v2/auth/middleware"
libLog "github.com/LerianStudio/lib-commons/v5/commons/log"
libLog "github.com/LerianStudio/lib-observability/log"
libHTTP "github.com/LerianStudio/lib-commons/v5/commons/net/http"
libOpenTelemetry "github.com/LerianStudio/lib-commons/v5/commons/opentelemetry"
libObsMiddleware "github.com/LerianStudio/lib-observability/middleware"
libOpenTelemetry "github.com/LerianStudio/lib-observability/tracing"
"github.com/gofiber/fiber/v2"
"github.com/gofiber/fiber/v2/middleware/cors"
fiberSwagger "github.com/swaggo/fiber-swagger"
Expand All @@ -32,13 +33,13 @@ func NewRouter(lg libLog.Logger, tl *libOpenTelemetry.Telemetry, auth *middlewar
return libHTTP.FiberErrorHandler(ctx, err)
},
})
tlMid := libHTTP.NewTelemetryMiddleware(tl)
tlMid := libObsMiddleware.NewTelemetryMiddleware(tl)

f.Use(ErrorCodeTransformer()) // Transform generic error codes to CRM-specific codes
f.Use(http.WithRecover(http.WithRecoverLogger(lg)))
f.Use(tlMid.WithTelemetry(tl))
f.Use(cors.New())
f.Use(libHTTP.WithHTTPLogging(libHTTP.WithCustomLogger(lg)))
f.Use(libObsMiddleware.WithHTTPLogging(libObsMiddleware.WithCustomLogger(lg)))
// Public endpoints: registered BEFORE tenant middleware so they remain
// accessible to Kubernetes probes, load balancer health checks, and
// Swagger documentation without requiring a JWT or tenant context.
Expand Down
4 changes: 2 additions & 2 deletions components/crm/internal/adapters/http/in/routes_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"testing"

"github.com/LerianStudio/lib-auth/v2/auth/middleware"
libLog "github.com/LerianStudio/lib-commons/v5/commons/log"
libOpentelemetry "github.com/LerianStudio/lib-commons/v5/commons/opentelemetry"
libLog "github.com/LerianStudio/lib-observability/log"
libOpentelemetry "github.com/LerianStudio/lib-observability/tracing"
"github.com/gofiber/fiber/v2"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ import (
"github.com/LerianStudio/midaz/v3/pkg/mmodel"
"github.com/LerianStudio/midaz/v3/pkg/net/http"

libCommons "github.com/LerianStudio/lib-commons/v5/commons"
libCommons "github.com/LerianStudio/lib-observability"
libCrypto "github.com/LerianStudio/lib-commons/v5/commons/crypto"
libLog "github.com/LerianStudio/lib-commons/v5/commons/log"
libLog "github.com/LerianStudio/lib-observability/log"
libMongo "github.com/LerianStudio/lib-commons/v5/commons/mongo"
libOpenTelemetry "github.com/LerianStudio/lib-commons/v5/commons/opentelemetry"
libOpenTelemetry "github.com/LerianStudio/lib-observability/tracing"
tmcore "github.com/LerianStudio/lib-commons/v5/commons/tenant-manager/core"
mongoUtils "github.com/LerianStudio/midaz/v3/pkg/mongo"
"github.com/google/uuid"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"strings"
"time"

libCommons "github.com/LerianStudio/lib-commons/v5/commons"
libLog "github.com/LerianStudio/lib-commons/v5/commons/log"
libOpenTelemetry "github.com/LerianStudio/lib-commons/v5/commons/opentelemetry"
libCommons "github.com/LerianStudio/lib-observability"
libLog "github.com/LerianStudio/lib-observability/log"
libOpenTelemetry "github.com/LerianStudio/lib-observability/tracing"
"github.com/LerianStudio/midaz/v3/pkg"
cn "github.com/LerianStudio/midaz/v3/pkg/constant"
"github.com/LerianStudio/midaz/v3/pkg/mmodel"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import (
"strings"

libCommons "github.com/LerianStudio/lib-commons/v5/commons"
libOpenTelemetry "github.com/LerianStudio/lib-commons/v5/commons/opentelemetry"
libObservability "github.com/LerianStudio/lib-observability"
libOpenTelemetry "github.com/LerianStudio/lib-observability/tracing"
"github.com/LerianStudio/midaz/v3/pkg/mmodel"
"github.com/LerianStudio/midaz/v3/pkg/net/http"
"github.com/google/uuid"
Expand All @@ -20,7 +21,7 @@ import (

// FindAll accounts by holder id and filter
func (am *MongoDBRepository) FindAll(ctx context.Context, organizationID string, holderID uuid.UUID, query http.QueryHeader, includeDeleted bool) ([]*mmodel.Alias, error) {
_, tracer, reqId, _ := libCommons.NewTrackingFromContext(ctx)
_, tracer, reqId, _ := libObservability.NewTrackingFromContext(ctx)

ctx, span := tracer.Start(ctx, "mongodb.find_all_aliases")
defer span.End()
Expand Down Expand Up @@ -187,7 +188,7 @@ func (am *MongoDBRepository) buildAliasFilter(query http.QueryHeader, holderID u
}

func (am *MongoDBRepository) Count(ctx context.Context, organizationID string, holderID uuid.UUID) (int64, error) {
_, tracer, reqId, _ := libCommons.NewTrackingFromContext(ctx)
_, tracer, reqId, _ := libObservability.NewTrackingFromContext(ctx)

ctx, span := tracer.Start(ctx, "mongodb.find_all_alias")
defer span.End()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ import (
"github.com/LerianStudio/midaz/v3/pkg/mmodel"
"github.com/LerianStudio/midaz/v3/pkg/net/http"

libCommons "github.com/LerianStudio/lib-commons/v5/commons"
libCommons "github.com/LerianStudio/lib-observability"
libCrypto "github.com/LerianStudio/lib-commons/v5/commons/crypto"
libLog "github.com/LerianStudio/lib-commons/v5/commons/log"
libLog "github.com/LerianStudio/lib-observability/log"
libMongo "github.com/LerianStudio/lib-commons/v5/commons/mongo"
libOpenTelemetry "github.com/LerianStudio/lib-commons/v5/commons/opentelemetry"
libOpenTelemetry "github.com/LerianStudio/lib-observability/tracing"
tmcore "github.com/LerianStudio/lib-commons/v5/commons/tenant-manager/core"
mongoUtils "github.com/LerianStudio/midaz/v3/pkg/mongo"
"github.com/google/uuid"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"context"
"strings"

libCommons "github.com/LerianStudio/lib-commons/v5/commons"
libOpenTelemetry "github.com/LerianStudio/lib-commons/v5/commons/opentelemetry"
libCommons "github.com/LerianStudio/lib-observability"
libOpenTelemetry "github.com/LerianStudio/lib-observability/tracing"
"github.com/LerianStudio/midaz/v3/pkg/mmodel"
"github.com/LerianStudio/midaz/v3/pkg/net/http"
"go.mongodb.org/mongo-driver/bson"
Expand Down
8 changes: 4 additions & 4 deletions components/crm/internal/bootstrap/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import (
"github.com/LerianStudio/lib-auth/v2/auth/middleware"
libCommons "github.com/LerianStudio/lib-commons/v5/commons"
libCrypto "github.com/LerianStudio/lib-commons/v5/commons/crypto"
libLog "github.com/LerianStudio/lib-commons/v5/commons/log"
libLog "github.com/LerianStudio/lib-observability/log"
libMongo "github.com/LerianStudio/lib-commons/v5/commons/mongo"
libOpentelemetry "github.com/LerianStudio/lib-commons/v5/commons/opentelemetry"
"github.com/LerianStudio/lib-commons/v5/commons/opentelemetry/metrics"
libZap "github.com/LerianStudio/lib-commons/v5/commons/zap"
libOpentelemetry "github.com/LerianStudio/lib-observability/tracing"
"github.com/LerianStudio/lib-observability/metrics"
libZap "github.com/LerianStudio/lib-observability/zap"
"github.com/LerianStudio/midaz/v3/components/crm/internal/adapters/http/in"
"github.com/LerianStudio/midaz/v3/components/crm/internal/adapters/mongodb/alias"
"github.com/LerianStudio/midaz/v3/components/crm/internal/adapters/mongodb/holder"
Expand Down
6 changes: 3 additions & 3 deletions components/crm/internal/bootstrap/config.tenant.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"strings"
"time"

libLog "github.com/LerianStudio/lib-commons/v5/commons/log"
libOpentelemetry "github.com/LerianStudio/lib-commons/v5/commons/opentelemetry"
"github.com/LerianStudio/lib-commons/v5/commons/opentelemetry/metrics"
libLog "github.com/LerianStudio/lib-observability/log"
libOpentelemetry "github.com/LerianStudio/lib-observability/tracing"
"github.com/LerianStudio/lib-observability/metrics"
tmclient "github.com/LerianStudio/lib-commons/v5/commons/tenant-manager/client"
tmevent "github.com/LerianStudio/lib-commons/v5/commons/tenant-manager/event"
tmmiddleware "github.com/LerianStudio/lib-commons/v5/commons/tenant-manager/middleware"
Expand Down
4 changes: 2 additions & 2 deletions components/crm/internal/bootstrap/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"reflect"
"testing"

libLog "github.com/LerianStudio/lib-commons/v5/commons/log"
libOpentelemetry "github.com/LerianStudio/lib-commons/v5/commons/opentelemetry"
libLog "github.com/LerianStudio/lib-observability/log"
libOpentelemetry "github.com/LerianStudio/lib-observability/tracing"
"github.com/gofiber/fiber/v2"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
4 changes: 2 additions & 2 deletions components/crm/internal/bootstrap/readyz.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"sync/atomic"
"time"

libLog "github.com/LerianStudio/lib-commons/v5/commons/log"
"github.com/LerianStudio/lib-commons/v5/commons/opentelemetry/metrics"
libLog "github.com/LerianStudio/lib-observability/log"
"github.com/LerianStudio/lib-observability/metrics"
"github.com/LerianStudio/midaz/v3/pkg/utils"
"github.com/gofiber/fiber/v2"
"go.opentelemetry.io/otel/attribute"
Expand Down
2 changes: 1 addition & 1 deletion components/crm/internal/bootstrap/readyz_checkers.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"fmt"
"time"

libLog "github.com/LerianStudio/lib-commons/v5/commons/log"
libLog "github.com/LerianStudio/lib-observability/log"
libMongo "github.com/LerianStudio/lib-commons/v5/commons/mongo"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"net/http/httptest"
"testing"

libLog "github.com/LerianStudio/lib-commons/v5/commons/log"
libLog "github.com/LerianStudio/lib-observability/log"
"github.com/gofiber/fiber/v2"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion components/crm/internal/bootstrap/readyz_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"testing"
"time"

libLog "github.com/LerianStudio/lib-commons/v5/commons/log"
libLog "github.com/LerianStudio/lib-observability/log"
"github.com/gofiber/fiber/v2"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
4 changes: 2 additions & 2 deletions components/crm/internal/bootstrap/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"time"

libCommons "github.com/LerianStudio/lib-commons/v5/commons"
libCommonsLog "github.com/LerianStudio/lib-commons/v5/commons/log"
libCommonsOtel "github.com/LerianStudio/lib-commons/v5/commons/opentelemetry"
libCommonsLog "github.com/LerianStudio/lib-observability/log"
libCommonsOtel "github.com/LerianStudio/lib-observability/tracing"
libCommonsServer "github.com/LerianStudio/lib-commons/v5/commons/server"
"github.com/gofiber/fiber/v2"
)
Expand Down
2 changes: 1 addition & 1 deletion components/crm/internal/bootstrap/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"syscall"

libCommons "github.com/LerianStudio/lib-commons/v5/commons"
libLog "github.com/LerianStudio/lib-commons/v5/commons/log"
libLog "github.com/LerianStudio/lib-observability/log"
tmevent "github.com/LerianStudio/lib-commons/v5/commons/tenant-manager/event"
)

Expand Down
7 changes: 4 additions & 3 deletions components/crm/internal/services/create-alias.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@ import (
"time"

libCommons "github.com/LerianStudio/lib-commons/v5/commons"
libLog "github.com/LerianStudio/lib-commons/v5/commons/log"
libOpenTelemetry "github.com/LerianStudio/lib-commons/v5/commons/opentelemetry"
libObservability "github.com/LerianStudio/lib-observability"
libLog "github.com/LerianStudio/lib-observability/log"
libOpenTelemetry "github.com/LerianStudio/lib-observability/tracing"
"github.com/LerianStudio/midaz/v3/pkg/mmodel"
"github.com/google/uuid"
"go.opentelemetry.io/otel/attribute"
)

func (uc *UseCase) CreateAlias(ctx context.Context, organizationID string, holderID uuid.UUID, cai *mmodel.CreateAliasInput) (*mmodel.Alias, error) {
logger, tracer, reqId, _ := libCommons.NewTrackingFromContext(ctx)
logger, tracer, reqId, _ := libObservability.NewTrackingFromContext(ctx)

ctx, span := tracer.Start(ctx, "service.create_alias")
defer span.End()
Expand Down
7 changes: 4 additions & 3 deletions components/crm/internal/services/create-holder.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,17 @@ import (
"time"

libCommons "github.com/LerianStudio/lib-commons/v5/commons"
libOpenTelemetry "github.com/LerianStudio/lib-commons/v5/commons/opentelemetry"
libObservability "github.com/LerianStudio/lib-observability"
libOpenTelemetry "github.com/LerianStudio/lib-observability/tracing"
"github.com/LerianStudio/midaz/v3/pkg/mmodel"
"go.opentelemetry.io/otel/attribute"

// CreateHolder inserts a holder data in the repository
libLog "github.com/LerianStudio/lib-commons/v5/commons/log"
libLog "github.com/LerianStudio/lib-observability/log"
)

func (uc *UseCase) CreateHolder(ctx context.Context, organizationID string, chi *mmodel.CreateHolderInput) (*mmodel.Holder, error) {
logger, tracer, reqId, _ := libCommons.NewTrackingFromContext(ctx)
logger, tracer, reqId, _ := libObservability.NewTrackingFromContext(ctx)

ctx, span := tracer.Start(ctx, "service.create_holder")
defer span.End()
Expand Down
6 changes: 3 additions & 3 deletions components/crm/internal/services/delete-alias.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"context"
"fmt"

libCommons "github.com/LerianStudio/lib-commons/v5/commons"
libLog "github.com/LerianStudio/lib-commons/v5/commons/log"
libOpenTelemetry "github.com/LerianStudio/lib-commons/v5/commons/opentelemetry"
libCommons "github.com/LerianStudio/lib-observability"
libLog "github.com/LerianStudio/lib-observability/log"
libOpenTelemetry "github.com/LerianStudio/lib-observability/tracing"
"github.com/google/uuid"
"go.opentelemetry.io/otel/attribute"
)
Expand Down
Loading
Loading