Skip to content
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

Jump to bottom

fix: correct is_ci value in metrics from APIC #1697

Merged
merged 3 commits into from
Nov 6, 2023
Merged

fix: correct is_ci value in metrics from APIC #1697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5a6cfd
use the options way
h4ck3rk3y Nov 6, 2023
ad01817
pass down is ci
h4ck3rk3y Nov 6, 2023
7a3ac55
rename metrics lib
h4ck3rk3y Nov 6, 2023
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
3 changes: 1 addition & 2 deletions ...ramework/highlevel/engine_consuming_kurtosis_command/engine_consuming_kurtosis_command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package engine_consuming_kurtosis_command

import (
"context"

portal_constructors "github.com/kurtosis-tech/kurtosis-portal/api/golang/constructors"
"github.com/kurtosis-tech/kurtosis/api/golang/engine/kurtosis_engine_rpc_api_bindings"
"github.com/kurtosis-tech/kurtosis/api/golang/engine/lib/kurtosis_context"
Expand All @@ -16,7 +15,7 @@ import (
"github.com/kurtosis-tech/kurtosis/cli/cli/helpers/portal_manager"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface"
"github.com/kurtosis-tech/kurtosis/contexts-config-store/store"
metrics_client "github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
"github.com/kurtosis-tech/stacktrace"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
Expand Down
2 changes: 1 addition & 1 deletion cli/cli/commands/clean/clean.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/container"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/engine"
metrics_client "github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
"github.com/kurtosis-tech/stacktrace"
"github.com/sirupsen/logrus"
"sort"
Expand Down
2 changes: 1 addition & 1 deletion cli/cli/commands/dump/dump.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/kurtosis-tech/kurtosis/cli/cli/command_framework/lowlevel/flags"
"github.com/kurtosis-tech/kurtosis/cli/cli/command_str_consts"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface"
metrics_client "github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
"github.com/kurtosis-tech/stacktrace"
"github.com/sirupsen/logrus"
"time"
Expand Down
2 changes: 1 addition & 1 deletion cli/cli/commands/enclave/add/add.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/kurtosis-tech/kurtosis/cli/cli/helpers/logrus_log_levels"
"github.com/kurtosis-tech/kurtosis/cli/cli/helpers/output_printers"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface"
metrics_client "github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
"github.com/kurtosis-tech/stacktrace"
"github.com/sirupsen/logrus"
"strings"
Expand Down
2 changes: 1 addition & 1 deletion cli/cli/commands/enclave/dump/dump.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/kurtosis-tech/kurtosis/cli/cli/command_str_consts"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/enclave"
metrics_client "github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
"github.com/kurtosis-tech/stacktrace"
"github.com/sirupsen/logrus"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/cli/commands/enclave/inspect/inspect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/kurtosis-tech/kurtosis/cli/cli/helpers/output_printers"
"github.com/kurtosis-tech/kurtosis/cli/cli/out"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface"
metrics_client "github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
"github.com/kurtosis-tech/stacktrace"
"github.com/sirupsen/logrus"
"sort"
Expand Down
2 changes: 1 addition & 1 deletion cli/cli/commands/enclave/ls/ls.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/kurtosis-tech/kurtosis/cli/cli/helpers/enclave_status_stringifier"
"github.com/kurtosis-tech/kurtosis/cli/cli/helpers/output_printers"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface"
metrics_client "github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
"github.com/kurtosis-tech/stacktrace"
"sort"
"strings"
Expand Down
2 changes: 1 addition & 1 deletion cli/cli/commands/enclave/rm/rm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/kurtosis-tech/kurtosis/cli/cli/command_framework/lowlevel/flags"
"github.com/kurtosis-tech/kurtosis/cli/cli/command_str_consts"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface"
metrics_client "github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
"github.com/kurtosis-tech/stacktrace"
"github.com/sirupsen/logrus"
"sort"
Expand Down
2 changes: 1 addition & 1 deletion cli/cli/commands/enclave/stop/stop.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/kurtosis-tech/kurtosis/cli/cli/command_framework/lowlevel/flags"
"github.com/kurtosis-tech/kurtosis/cli/cli/command_str_consts"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface"
metrics_client "github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
"github.com/kurtosis-tech/stacktrace"
"github.com/sirupsen/logrus"
"strings"
Expand Down
2 changes: 1 addition & 1 deletion cli/cli/commands/engine/logs/logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/kurtosis-tech/kurtosis/cli/cli/command_framework/lowlevel/flags"
"github.com/kurtosis-tech/kurtosis/cli/cli/command_str_consts"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface"
metrics_client "github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
"github.com/kurtosis-tech/stacktrace"
"github.com/sirupsen/logrus"
"time"
Expand Down
2 changes: 1 addition & 1 deletion cli/cli/commands/files/download/download.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/kurtosis-tech/kurtosis/cli/cli/command_framework/lowlevel/flags"
"github.com/kurtosis-tech/kurtosis/cli/cli/command_str_consts"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface"
metrics_client "github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
"github.com/kurtosis-tech/stacktrace"
"github.com/mholt/archiver"
"github.com/sirupsen/logrus"
Expand Down
2 changes: 1 addition & 1 deletion cli/cli/commands/files/inspect/inspect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/kurtosis-tech/kurtosis/cli/cli/command_framework/lowlevel/flags"
"github.com/kurtosis-tech/kurtosis/cli/cli/command_str_consts"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface"
metrics_client "github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
"github.com/kurtosis-tech/stacktrace"
"github.com/sirupsen/logrus"
"github.com/xlab/treeprint"
Expand Down
2 changes: 1 addition & 1 deletion cli/cli/commands/files/rendertemplate/rendertemplate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/kurtosis-tech/kurtosis/cli/cli/command_framework/lowlevel/flags"
"github.com/kurtosis-tech/kurtosis/cli/cli/command_str_consts"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface"
metrics_client "github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
"github.com/kurtosis-tech/stacktrace"
"github.com/sirupsen/logrus"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/cli/commands/files/storeservice/storeservice.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/kurtosis-tech/kurtosis/cli/cli/command_framework/lowlevel/flags"
"github.com/kurtosis-tech/kurtosis/cli/cli/command_str_consts"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface"
metrics_client "github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
"github.com/kurtosis-tech/stacktrace"
"github.com/sirupsen/logrus"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/cli/commands/files/storeweb/storeweb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/kurtosis-tech/kurtosis/cli/cli/command_framework/lowlevel/flags"
"github.com/kurtosis-tech/kurtosis/cli/cli/command_str_consts"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface"
metrics_client "github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
"github.com/kurtosis-tech/stacktrace"
"github.com/sirupsen/logrus"
"time"
Expand Down
2 changes: 1 addition & 1 deletion cli/cli/commands/files/upload/upload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/kurtosis-tech/kurtosis/cli/cli/command_framework/lowlevel/flags"
"github.com/kurtosis-tech/kurtosis/cli/cli/command_str_consts"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface"
metrics_client "github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
"github.com/kurtosis-tech/stacktrace"
"github.com/sirupsen/logrus"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/cli/commands/import/import.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
_run "github.com/kurtosis-tech/kurtosis/cli/cli/commands/run"
"github.com/kurtosis-tech/kurtosis/cli/cli/commands/service/add"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface"
metrics_client "github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
"github.com/kurtosis-tech/kurtosis/name_generator"
"github.com/kurtosis-tech/stacktrace"
"github.com/sirupsen/logrus"
Expand Down
2 changes: 1 addition & 1 deletion cli/cli/commands/port/print/print.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/kurtosis-tech/kurtosis/cli/cli/command_str_consts"
"github.com/kurtosis-tech/kurtosis/cli/cli/out"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface"
metrics_client "github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
"github.com/kurtosis-tech/stacktrace"
"github.com/sirupsen/logrus"
"strings"
Expand Down
2 changes: 1 addition & 1 deletion cli/cli/commands/run/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
"github.com/kurtosis-tech/kurtosis/cli/cli/helpers/portal_manager"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface"
"github.com/kurtosis-tech/kurtosis/contexts-config-store/store"
metrics_client "github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
"github.com/kurtosis-tech/stacktrace"
"github.com/sirupsen/logrus"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/cli/commands/service/add/add.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/uuid_generator"
"github.com/kurtosis-tech/kurtosis/contexts-config-store/store"
metrics_client "github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
"github.com/kurtosis-tech/stacktrace"
"github.com/sirupsen/logrus"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/cli/commands/service/exec/exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/enclave"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/service"
metrics_client "github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
"github.com/kurtosis-tech/stacktrace"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/cli/commands/service/inspect/inspect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/kurtosis-tech/kurtosis/cli/cli/helpers/user_services"
"github.com/kurtosis-tech/kurtosis/cli/cli/out"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface"
metrics_client "github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
"github.com/kurtosis-tech/stacktrace"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/cli/commands/service/logs/logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"github.com/kurtosis-tech/kurtosis/cli/cli/out"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/user_support_constants"
metrics_client "github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
"github.com/kurtosis-tech/stacktrace"
"github.com/sirupsen/logrus"
"os"
Expand Down
2 changes: 1 addition & 1 deletion cli/cli/commands/service/rm/rm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/kurtosis-tech/kurtosis/cli/cli/command_framework/lowlevel/flags"
"github.com/kurtosis-tech/kurtosis/cli/cli/command_str_consts"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface"
metrics_client "github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
"github.com/kurtosis-tech/stacktrace"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/cli/commands/service/shell/shell.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/enclave"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/service"
metrics_client "github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
"github.com/kurtosis-tech/stacktrace"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/cli/commands/service/start/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/kurtosis-tech/kurtosis/cli/cli/command_framework/lowlevel/flags"
"github.com/kurtosis-tech/kurtosis/cli/cli/command_str_consts"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface"
metrics_client "github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
"github.com/kurtosis-tech/stacktrace"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/cli/commands/service/stop/stop.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/kurtosis-tech/kurtosis/cli/cli/command_framework/lowlevel/flags"
"github.com/kurtosis-tech/kurtosis/cli/cli/command_str_consts"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface"
metrics_client "github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
"github.com/kurtosis-tech/stacktrace"
"github.com/sirupsen/logrus"
)
Expand Down
3 changes: 3 additions & 0 deletions cli/cli/helpers/engine_manager/engine_existence_guarantor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/user_support_constants"
"github.com/kurtosis-tech/kurtosis/engine/launcher/engine_server_launcher"
"github.com/kurtosis-tech/kurtosis/kurtosis_version"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
"github.com/kurtosis-tech/stacktrace"
"github.com/sirupsen/logrus"
)
Expand Down Expand Up @@ -158,6 +159,7 @@ func (guarantor *engineExistenceGuarantor) VisitStopped() error {
guarantor.onBastionHost,
guarantor.poolSize,
guarantor.enclaveEnvVars,
metrics_client.IsCI(),
)
} else {
_, _, engineLaunchErr = guarantor.engineServerLauncher.LaunchWithCustomVersion(
Expand All @@ -171,6 +173,7 @@ func (guarantor *engineExistenceGuarantor) VisitStopped() error {
guarantor.onBastionHost,
guarantor.poolSize,
guarantor.enclaveEnvVars,
metrics_client.IsCI(),
)
}
if engineLaunchErr != nil {
Expand Down
37 changes: 20 additions & 17 deletions cli/cli/helpers/metrics_client_factory/metrics_client_factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/kurtosis-tech/kurtosis/cli/cli/kurtosis_config/resolved_config"
"github.com/kurtosis-tech/kurtosis/kurtosis_version"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/analytics_logger"
metrics_client "github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/source"
"github.com/kurtosis-tech/stacktrace"
"github.com/sirupsen/logrus"
Expand Down Expand Up @@ -44,14 +44,16 @@ func GetMetricsClient() (metrics_client.MetricsClient, func() error, error) {

logger := logrus.StandardLogger()
metricsClient, metricsClientCloseFunc, err := metrics_client.CreateMetricsClient(
source.KurtosisCLISource,
kurtosis_version.KurtosisVersion,
metricsUserId,
clusterType,
sendUserMetrics,
shouldFlushMetricsClientQueueOnEachEvent,
do_nothing_metrics_client_callback.NewDoNothingMetricsClientCallback(),
analytics_logger.ConvertLogrusLoggerToAnalyticsLogger(logger),
metrics_client.NewMetricsClientCreatorOption(
source.KurtosisCLISource,
kurtosis_version.KurtosisVersion,
metricsUserId,
clusterType,
sendUserMetrics,
shouldFlushMetricsClientQueueOnEachEvent,
do_nothing_metrics_client_callback.NewDoNothingMetricsClientCallback(),
analytics_logger.ConvertLogrusLoggerToAnalyticsLogger(logger),
metrics_client.IsCI()),
)

if err != nil {
Expand All @@ -72,14 +74,15 @@ func GetSegmentClient() (metrics_client.MetricsClient, func() error, error) {

logger := logrus.StandardLogger()
metricsClient, metricsClientCloseFunc, err := metrics_client.CreateMetricsClient(
source.KurtosisCLISource,
kurtosis_version.KurtosisVersion,
metricsUserId,
clusterType,
sendUserMetrics,
shouldFlushMetricsClientQueueOnEachEvent,
do_nothing_metrics_client_callback.NewDoNothingMetricsClientCallback(),
analytics_logger.ConvertLogrusLoggerToAnalyticsLogger(logger),
metrics_client.NewMetricsClientCreatorOption(source.KurtosisCLISource,
kurtosis_version.KurtosisVersion,
metricsUserId,
clusterType,
sendUserMetrics,
shouldFlushMetricsClientQueueOnEachEvent,
do_nothing_metrics_client_callback.NewDoNothingMetricsClientCallback(),
analytics_logger.ConvertLogrusLoggerToAnalyticsLogger(logger),
metrics_client.IsCI()),
)

if err != nil {
Expand Down
21 changes: 12 additions & 9 deletions cli/cli/helpers/user_send_metrics_election/user_send_metrics_election_tracker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/kurtosis-tech/kurtosis/cli/cli/kurtosis_config/resolved_config"
"github.com/kurtosis-tech/kurtosis/kurtosis_version"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/analytics_logger"
metrics_client "github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/source"
"github.com/kurtosis-tech/stacktrace"
"github.com/sirupsen/logrus"
Expand Down Expand Up @@ -54,14 +54,17 @@ func SendAnyBackloggedUserMetricsElectionEvent() error {
logger := logrus.StandardLogger()
// This is a special metrics client that, will record their decision about whether to send metrics or not
metricsClient, metricsClientCloseFunc, err := metrics_client.CreateMetricsClient(
source.KurtosisCLISource,
kurtosis_version.KurtosisVersion,
metricsUserId,
clusterType,
didUserAcceptSendingMetricsValueForMetricsClientCreation,
shouldFlushMetricsClientQueueOnEachEvent,
metricsClientCallback,
analytics_logger.ConvertLogrusLoggerToAnalyticsLogger(logger),
metrics_client.NewMetricsClientCreatorOption(
source.KurtosisCLISource,
kurtosis_version.KurtosisVersion,
metricsUserId,
clusterType,
didUserAcceptSendingMetricsValueForMetricsClientCreation,
shouldFlushMetricsClientQueueOnEachEvent,
metricsClientCallback,
analytics_logger.ConvertLogrusLoggerToAnalyticsLogger(logger),
metrics_client.IsCI(),
),
)
if err != nil {
return stacktrace.Propagate(err, "An error occurred creating the metrics client for recording send-metrics election")
Expand Down
Loading
Loading