Skip to content

fix(usage): add missing error filtering for users/admin #1119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 22, 2025
Merged

fix(usage): add missing error filtering for users/admin #1119

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 17 additions & 2 deletions pkg/usage/usage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ import (
"context"
"encoding/json"
"fmt"
"strings"
"time"

"github.com/gofrs/uuid"
"github.com/redis/go-redis/v9"
"google.golang.org/protobuf/types/known/timestamppb"

Expand Down Expand Up @@ -41,10 +43,15 @@ func NewUsage(ctx context.Context, r repository.Repository, m mgmtpb.MgmtPrivate
logger, _ := logx.GetZapLogger(ctx)

var defaultOwnerUID string
if resp, err := m.GetUserAdmin(ctx, &mgmtpb.GetUserAdminRequest{UserId: constant.DefaultUserID}); err == nil {
defaultOwnerUID = resp.GetUser().GetUid()
if user, err := m.GetUserAdmin(ctx, &mgmtpb.GetUserAdminRequest{UserId: constant.DefaultUserID}); err == nil {
defaultOwnerUID = user.GetUser().GetUid()
} else if strings.Contains(err.Error(), "users/admin") {
// Only Instill Core CE has the default user "admin"
logger.Debug(fmt.Sprintf("error getting default user: %v, use a zero uuid as default owner uid", err))
defaultOwnerUID = uuid.Nil.String()
} else {
logger.Error(err.Error())
return nil
}

reporter, err := usageclient.InitReporter(ctx, usc, usagepb.Session_SERVICE_PIPELINE, config.Config.Server.Edition, serviceVersion, defaultOwnerUID)
Expand Down Expand Up @@ -219,6 +226,10 @@ func (u *usage) StartReporter(ctx context.Context) {
var defaultOwnerUID string
if resp, err := u.mgmtPrivateServiceClient.GetUserAdmin(ctx, &mgmtpb.GetUserAdminRequest{UserId: constant.DefaultUserID}); err == nil {
defaultOwnerUID = resp.GetUser().GetUid()
} else if strings.Contains(err.Error(), "users/admin") {
// Only Instill Core CE has the default user "admin"
logger.Debug(fmt.Sprintf("error getting default user: %v, use a zero uuid as default owner uid", err))
defaultOwnerUID = uuid.Nil.String()
} else {
logger.Error(err.Error())
return
Expand All @@ -243,6 +254,10 @@ func (u *usage) TriggerSingleReporter(ctx context.Context) {
var defaultOwnerUID string
if resp, err := u.mgmtPrivateServiceClient.GetUserAdmin(ctx, &mgmtpb.GetUserAdminRequest{UserId: constant.DefaultUserID}); err == nil {
defaultOwnerUID = resp.GetUser().GetUid()
} else if strings.Contains(err.Error(), "users/admin") {
// Only Instill Core CE has the default user "admin"
logger.Debug(fmt.Sprintf("error getting default user: %v, use a zero uuid as default owner uid", err))
defaultOwnerUID = uuid.Nil.String()
} else {
logger.Error(err.Error())
return
Expand Down
Loading