diff --git a/internal/cmd/base/dev.go b/internal/cmd/base/dev.go index 7eb277a32..9f3f04473 100644 --- a/internal/cmd/base/dev.go +++ b/internal/cmd/base/dev.go @@ -18,9 +18,9 @@ import ( "github.com/hashicorp/boundary/internal/cmd/base/internal/docker" "github.com/hashicorp/boundary/internal/db" "github.com/hashicorp/boundary/internal/db/schema" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/kms" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/types/scope" "github.com/hashicorp/boundary/testing/dbtest" capoidc "github.com/hashicorp/cap/oidc" diff --git a/internal/cmd/base/dev_test.go b/internal/cmd/base/dev_test.go index a6df4e0c1..9a2842c8f 100644 --- a/internal/cmd/base/dev_test.go +++ b/internal/cmd/base/dev_test.go @@ -11,7 +11,7 @@ import ( "sync" "testing" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/eventlogger/formatter_filters/cloudevents" "github.com/hashicorp/go-hclog" "github.com/stretchr/testify/assert" diff --git a/internal/cmd/base/event_flags.go b/internal/cmd/base/event_flags.go index ee83cb19e..d6de804f2 100644 --- a/internal/cmd/base/event_flags.go +++ b/internal/cmd/base/event_flags.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/go-bexpr" ) diff --git a/internal/cmd/base/event_flags_test.go b/internal/cmd/base/event_flags_test.go index 0fa408007..26630d8b3 100644 --- a/internal/cmd/base/event_flags_test.go +++ b/internal/cmd/base/event_flags_test.go @@ -6,7 +6,7 @@ package base import ( "testing" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/cmd/base/option.go b/internal/cmd/base/option.go index dbe837bbe..68f69df0b 100644 --- a/internal/cmd/base/option.go +++ b/internal/cmd/base/option.go @@ -4,7 +4,7 @@ package base import ( - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/sdk/pbs/plugin" wrapping "github.com/hashicorp/go-kms-wrapping/v2" ) diff --git a/internal/cmd/base/option_test.go b/internal/cmd/base/option_test.go index a63113f2b..4305d0746 100644 --- a/internal/cmd/base/option_test.go +++ b/internal/cmd/base/option_test.go @@ -6,7 +6,7 @@ package base import ( "testing" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" "github.com/stretchr/testify/assert" ) diff --git a/internal/cmd/base/profiling_on.go b/internal/cmd/base/profiling_on.go index d1bd9db86..ef93c07d3 100644 --- a/internal/cmd/base/profiling_on.go +++ b/internal/cmd/base/profiling_on.go @@ -14,7 +14,7 @@ import ( "runtime/pprof" "time" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" ) func StartMemProfiler(ctx context.Context) { diff --git a/internal/cmd/base/server_test.go b/internal/cmd/base/server_test.go index 8e90d4c37..9c7d6bf46 100644 --- a/internal/cmd/base/server_test.go +++ b/internal/cmd/base/server_test.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/boundary/globals" "github.com/hashicorp/boundary/internal/cmd/config" "github.com/hashicorp/boundary/internal/errors" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/go-hclog" wrapping "github.com/hashicorp/go-kms-wrapping/v2" "github.com/hashicorp/go-kms-wrapping/v2/extras/multi" diff --git a/internal/cmd/base/servers.go b/internal/cmd/base/servers.go index eee82949e..c632d06b6 100644 --- a/internal/cmd/base/servers.go +++ b/internal/cmd/base/servers.go @@ -28,8 +28,8 @@ import ( "github.com/hashicorp/boundary/internal/cmd/config" "github.com/hashicorp/boundary/internal/db" berrors "github.com/hashicorp/boundary/internal/errors" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/internal/kms" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/types/scope" "github.com/hashicorp/boundary/internal/util" kms_plugin_assets "github.com/hashicorp/boundary/plugins/kms" diff --git a/internal/cmd/commands/database/migrate.go b/internal/cmd/commands/database/migrate.go index da8a0c4ac..8ab0ddb15 100644 --- a/internal/cmd/commands/database/migrate.go +++ b/internal/cmd/commands/database/migrate.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/boundary/internal/cmd/config" "github.com/hashicorp/boundary/internal/db/schema" "github.com/hashicorp/boundary/internal/errors" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" boundary_plugin_assets "github.com/hashicorp/boundary/plugins/boundary" external_plugins "github.com/hashicorp/boundary/sdk/plugins" "github.com/hashicorp/go-secure-stdlib/mlock" diff --git a/internal/cmd/commands/dev/dev.go b/internal/cmd/commands/dev/dev.go index 5a365f129..5c4d22dfa 100644 --- a/internal/cmd/commands/dev/dev.go +++ b/internal/cmd/commands/dev/dev.go @@ -23,7 +23,7 @@ import ( "github.com/hashicorp/boundary/internal/daemon/controller" "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/daemon/worker" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/internal/server" "github.com/hashicorp/boundary/internal/server/store" "github.com/hashicorp/boundary/internal/types/scope" diff --git a/internal/cmd/commands/server/server.go b/internal/cmd/commands/server/server.go index eae10e2e9..9e6557ddc 100644 --- a/internal/cmd/commands/server/server.go +++ b/internal/cmd/commands/server/server.go @@ -24,8 +24,8 @@ import ( "github.com/hashicorp/boundary/internal/db" "github.com/hashicorp/boundary/internal/db/schema" "github.com/hashicorp/boundary/internal/errors" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/internal/kms" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-multierror" "github.com/hashicorp/go-secure-stdlib/mlock" diff --git a/internal/cmd/config/config.go b/internal/cmd/config/config.go index 68e67985f..3beec298b 100644 --- a/internal/cmd/config/config.go +++ b/internal/cmd/config/config.go @@ -21,7 +21,7 @@ import ( "github.com/hashicorp/boundary/globals" "github.com/hashicorp/boundary/internal/db" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/internal/util" kms_plugin_assets "github.com/hashicorp/boundary/plugins/kms" "github.com/hashicorp/boundary/sdk/wrapper" diff --git a/internal/cmd/config/config_load_test.go b/internal/cmd/config/config_load_test.go index 036cef34a..392174cc2 100644 --- a/internal/cmd/config/config_load_test.go +++ b/internal/cmd/config/config_load_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/hashicorp/boundary/internal/cmd/config" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" configutil "github.com/hashicorp/go-secure-stdlib/configutil/v2" "github.com/hashicorp/go-secure-stdlib/listenerutil" "github.com/stretchr/testify/require" diff --git a/internal/cmd/config/config_test.go b/internal/cmd/config/config_test.go index e0141ab88..7aeef2af4 100644 --- a/internal/cmd/config/config_test.go +++ b/internal/cmd/config/config_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" configutil "github.com/hashicorp/go-secure-stdlib/configutil/v2" "github.com/hashicorp/go-secure-stdlib/listenerutil" "github.com/hashicorp/go-secure-stdlib/parseutil" diff --git a/internal/credential/vault/jobs.go b/internal/credential/vault/jobs.go index abc5ce344..132639eb9 100644 --- a/internal/credential/vault/jobs.go +++ b/internal/credential/vault/jobs.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/boundary/internal/db" "github.com/hashicorp/boundary/internal/errors" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/internal/kms" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/oplog" "github.com/hashicorp/boundary/internal/scheduler" vault "github.com/hashicorp/vault/api" diff --git a/internal/credential/vault/repository_credentials.go b/internal/credential/vault/repository_credentials.go index 3ab8f653b..d63ffb5f8 100644 --- a/internal/credential/vault/repository_credentials.go +++ b/internal/credential/vault/repository_credentials.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/boundary/internal/credential" "github.com/hashicorp/boundary/internal/db" "github.com/hashicorp/boundary/internal/errors" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" ) var _ credential.Issuer = (*Repository)(nil) diff --git a/internal/daemon/cluster/handlers/upstream_message_service_controller.go b/internal/daemon/cluster/handlers/upstream_message_service_controller.go index e83a2fc41..9626ff079 100644 --- a/internal/daemon/cluster/handlers/upstream_message_service_controller.go +++ b/internal/daemon/cluster/handlers/upstream_message_service_controller.go @@ -9,8 +9,8 @@ import ( "sync" "github.com/hashicorp/boundary/internal/errors" + "github.com/hashicorp/boundary/internal/event" pbs "github.com/hashicorp/boundary/internal/gen/controller/servers/services" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/util" "github.com/hashicorp/nodeenrollment" "github.com/hashicorp/nodeenrollment/types" diff --git a/internal/daemon/cluster/handlers/upstream_message_service_worker.go b/internal/daemon/cluster/handlers/upstream_message_service_worker.go index 4348ebee5..809b90356 100644 --- a/internal/daemon/cluster/handlers/upstream_message_service_worker.go +++ b/internal/daemon/cluster/handlers/upstream_message_service_worker.go @@ -9,8 +9,8 @@ import ( "sync" "github.com/hashicorp/boundary/internal/errors" + "github.com/hashicorp/boundary/internal/event" pbs "github.com/hashicorp/boundary/internal/gen/controller/servers/services" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/util" "github.com/hashicorp/nodeenrollment" "google.golang.org/grpc/codes" diff --git a/internal/daemon/cluster/handlers/worker_service.go b/internal/daemon/cluster/handlers/worker_service.go index d1f213bb7..98cfd4939 100644 --- a/internal/daemon/cluster/handlers/worker_service.go +++ b/internal/daemon/cluster/handlers/worker_service.go @@ -13,10 +13,10 @@ import ( dcommon "github.com/hashicorp/boundary/internal/daemon/common" "github.com/hashicorp/boundary/internal/daemon/controller/common" "github.com/hashicorp/boundary/internal/daemon/controller/handlers" + "github.com/hashicorp/boundary/internal/event" pbs "github.com/hashicorp/boundary/internal/gen/controller/servers/services" intglobals "github.com/hashicorp/boundary/internal/globals" "github.com/hashicorp/boundary/internal/kms" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/server" "github.com/hashicorp/boundary/internal/session" "github.com/hashicorp/boundary/internal/types/scope" diff --git a/internal/daemon/cluster/tracking_listener.go b/internal/daemon/cluster/tracking_listener.go index 5f238e87f..d7ce13c0f 100644 --- a/internal/daemon/cluster/tracking_listener.go +++ b/internal/daemon/cluster/tracking_listener.go @@ -11,7 +11,7 @@ import ( "net" "github.com/hashicorp/boundary/internal/errors" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/version" nodee "github.com/hashicorp/nodeenrollment" "github.com/hashicorp/nodeenrollment/protocol" diff --git a/internal/daemon/common/handler.go b/internal/daemon/common/handler.go index 278bc3b6f..53c70add9 100644 --- a/internal/daemon/common/handler.go +++ b/internal/daemon/common/handler.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/boundary/internal/daemon/controller/auth" "github.com/hashicorp/boundary/internal/errors" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/internal/kms" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/go-secure-stdlib/base62" "github.com/hashicorp/go-secure-stdlib/listenerutil" ) diff --git a/internal/daemon/common/handler_test.go b/internal/daemon/common/handler_test.go index 069adb3d0..5dd678ddd 100644 --- a/internal/daemon/common/handler_test.go +++ b/internal/daemon/common/handler_test.go @@ -19,8 +19,8 @@ import ( "github.com/hashicorp/boundary/internal/db" "github.com/hashicorp/boundary/internal/errors" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/internal/kms" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/eventlogger" "github.com/hashicorp/eventlogger/filters/gated" "github.com/hashicorp/eventlogger/formatter_filters/cloudevents" diff --git a/internal/daemon/controller/auth/auth.go b/internal/daemon/controller/auth/auth.go index ce73e06dd..21823f69f 100644 --- a/internal/daemon/controller/auth/auth.go +++ b/internal/daemon/controller/auth/auth.go @@ -20,11 +20,11 @@ import ( "github.com/hashicorp/boundary/internal/daemon/controller/common" "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/errors" + "github.com/hashicorp/boundary/internal/event" authpb "github.com/hashicorp/boundary/internal/gen/controller/auth" "github.com/hashicorp/boundary/internal/gen/controller/tokens" "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/kms" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/perms" "github.com/hashicorp/boundary/internal/requests" "github.com/hashicorp/boundary/internal/server" diff --git a/internal/daemon/controller/auth/auth_test.go b/internal/daemon/controller/auth/auth_test.go index 5364ac6e7..664466a46 100644 --- a/internal/daemon/controller/auth/auth_test.go +++ b/internal/daemon/controller/auth/auth_test.go @@ -16,10 +16,10 @@ import ( "github.com/hashicorp/boundary/internal/authtoken" "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/event" authpb "github.com/hashicorp/boundary/internal/gen/controller/auth" "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/kms" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/server" "github.com/hashicorp/boundary/internal/tests/api" "github.com/hashicorp/eventlogger/filters/encrypt" diff --git a/internal/daemon/controller/controller.go b/internal/daemon/controller/controller.go index 5c243e477..de032c90e 100644 --- a/internal/daemon/controller/controller.go +++ b/internal/daemon/controller/controller.go @@ -26,13 +26,13 @@ import ( "github.com/hashicorp/boundary/internal/daemon/controller/internal/metric" "github.com/hashicorp/boundary/internal/db" "github.com/hashicorp/boundary/internal/errors" + "github.com/hashicorp/boundary/internal/event" intglobals "github.com/hashicorp/boundary/internal/globals" pluginhost "github.com/hashicorp/boundary/internal/host/plugin" "github.com/hashicorp/boundary/internal/host/static" "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/kms" kmsjob "github.com/hashicorp/boundary/internal/kms/job" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/plugin" "github.com/hashicorp/boundary/internal/plugin/loopback" "github.com/hashicorp/boundary/internal/scheduler" diff --git a/internal/daemon/controller/gateway.go b/internal/daemon/controller/gateway.go index 3f9f9d7fa..931b625bb 100644 --- a/internal/daemon/controller/gateway.go +++ b/internal/daemon/controller/gateway.go @@ -16,8 +16,8 @@ import ( "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/db" "github.com/hashicorp/boundary/internal/errors" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/internal/kms" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/types/subtypes" "google.golang.org/grpc" "google.golang.org/grpc/test/bufconn" diff --git a/internal/daemon/controller/handler.go b/internal/daemon/controller/handler.go index a9085746b..b461c3cb3 100644 --- a/internal/daemon/controller/handler.go +++ b/internal/daemon/controller/handler.go @@ -42,10 +42,10 @@ import ( "github.com/hashicorp/boundary/internal/daemon/controller/handlers/users" "github.com/hashicorp/boundary/internal/daemon/controller/handlers/workers" "github.com/hashicorp/boundary/internal/daemon/controller/internal/metric" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/internal/gen/controller/api/services" authpb "github.com/hashicorp/boundary/internal/gen/controller/auth" opsservices "github.com/hashicorp/boundary/internal/gen/ops/services" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/go-cleanhttp" "github.com/hashicorp/go-secure-stdlib/listenerutil" "github.com/hashicorp/go-secure-stdlib/strutil" diff --git a/internal/daemon/controller/handler_noui.go b/internal/daemon/controller/handler_noui.go index 8b12e9f88..47b493294 100644 --- a/internal/daemon/controller/handler_noui.go +++ b/internal/daemon/controller/handler_noui.go @@ -8,7 +8,7 @@ import ( "net/http" "path/filepath" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" ) func devUiPassthroughHandler(uiPassthroughDir string) http.Handler { diff --git a/internal/daemon/controller/handlers/authmethods/oidc.go b/internal/daemon/controller/handlers/authmethods/oidc.go index fa40c5de5..1cef993e4 100644 --- a/internal/daemon/controller/handlers/authmethods/oidc.go +++ b/internal/daemon/controller/handlers/authmethods/oidc.go @@ -15,8 +15,8 @@ import ( "github.com/hashicorp/boundary/internal/daemon/controller/auth" "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/errors" + "github.com/hashicorp/boundary/internal/event" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/types/action" pb "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/authmethods" "google.golang.org/grpc/codes" diff --git a/internal/daemon/controller/handlers/errors.go b/internal/daemon/controller/handlers/errors.go index 50ce77e07..e381afe7b 100644 --- a/internal/daemon/controller/handlers/errors.go +++ b/internal/daemon/controller/handlers/errors.go @@ -15,9 +15,9 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/hashicorp/boundary/internal/errors" + "github.com/hashicorp/boundary/internal/event" pb "github.com/hashicorp/boundary/internal/gen/controller/api" pberrors "github.com/hashicorp/boundary/internal/gen/errors" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/mr-tron/base58" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/daemon/controller/interceptor.go b/internal/daemon/controller/interceptor.go index 2233a1ebd..7d749bd32 100644 --- a/internal/daemon/controller/interceptor.go +++ b/internal/daemon/controller/interceptor.go @@ -16,11 +16,11 @@ import ( "github.com/hashicorp/boundary/internal/daemon/controller/common" "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/errors" + "github.com/hashicorp/boundary/internal/event" pb "github.com/hashicorp/boundary/internal/gen/controller/api" authpb "github.com/hashicorp/boundary/internal/gen/controller/auth" pberrors "github.com/hashicorp/boundary/internal/gen/errors" "github.com/hashicorp/boundary/internal/kms" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/requests" "github.com/mr-tron/base58" "google.golang.org/grpc" diff --git a/internal/daemon/controller/interceptor_test.go b/internal/daemon/controller/interceptor_test.go index 3e77593c0..2f1991a29 100644 --- a/internal/daemon/controller/interceptor_test.go +++ b/internal/daemon/controller/interceptor_test.go @@ -18,13 +18,13 @@ import ( "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/db" "github.com/hashicorp/boundary/internal/errors" + "github.com/hashicorp/boundary/internal/event" pb_api "github.com/hashicorp/boundary/internal/gen/controller/api" authpb "github.com/hashicorp/boundary/internal/gen/controller/auth" pberrors "github.com/hashicorp/boundary/internal/gen/errors" "github.com/hashicorp/boundary/internal/gen/testing/interceptor" "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/kms" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/server" "github.com/hashicorp/go-hclog" "github.com/mr-tron/base58" diff --git a/internal/daemon/controller/kms_conn_router.go b/internal/daemon/controller/kms_conn_router.go index 45b89bc85..c354eb933 100644 --- a/internal/daemon/controller/kms_conn_router.go +++ b/internal/daemon/controller/kms_conn_router.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/boundary/internal/daemon/common" "github.com/hashicorp/boundary/internal/errors" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" nodeenet "github.com/hashicorp/nodeenrollment/net" ) diff --git a/internal/daemon/controller/listeners.go b/internal/daemon/controller/listeners.go index bf7547e46..46d3008bf 100644 --- a/internal/daemon/controller/listeners.go +++ b/internal/daemon/controller/listeners.go @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/boundary/internal/daemon/common" "github.com/hashicorp/boundary/internal/daemon/controller/internal/metric" "github.com/hashicorp/boundary/internal/errors" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/internal/util" "github.com/hashicorp/go-multierror" nodee "github.com/hashicorp/nodeenrollment" diff --git a/internal/daemon/controller/testing.go b/internal/daemon/controller/testing.go index 2a24eecd5..bdbd348e7 100644 --- a/internal/daemon/controller/testing.go +++ b/internal/daemon/controller/testing.go @@ -27,11 +27,11 @@ import ( "github.com/hashicorp/boundary/internal/credential/vault" "github.com/hashicorp/boundary/internal/db" "github.com/hashicorp/boundary/internal/db/schema" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/internal/gen/testing/interceptor" "github.com/hashicorp/boundary/internal/host/plugin" "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/kms" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/scheduler" "github.com/hashicorp/boundary/internal/server" "github.com/hashicorp/boundary/internal/session" diff --git a/internal/daemon/controller/tickers.go b/internal/daemon/controller/tickers.go index ded7fd201..f3694d9f3 100644 --- a/internal/daemon/controller/tickers.go +++ b/internal/daemon/controller/tickers.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/boundary/internal/daemon/cluster" "github.com/hashicorp/boundary/internal/daemon/common" "github.com/hashicorp/boundary/internal/errors" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/internal/server" "github.com/hashicorp/boundary/internal/server/store" "github.com/hashicorp/boundary/internal/types/scope" diff --git a/internal/daemon/controller/worker_tls_config.go b/internal/daemon/controller/worker_tls_config.go index 659202cbc..bed741a76 100644 --- a/internal/daemon/controller/worker_tls_config.go +++ b/internal/daemon/controller/worker_tls_config.go @@ -15,7 +15,7 @@ import ( "strings" "github.com/hashicorp/boundary/internal/cmd/base" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/internal/server" "github.com/hashicorp/boundary/version" wrapping "github.com/hashicorp/go-kms-wrapping/v2" diff --git a/internal/daemon/worker/auth_rotation.go b/internal/daemon/worker/auth_rotation.go index 5b2e23293..6599fb507 100644 --- a/internal/daemon/worker/auth_rotation.go +++ b/internal/daemon/worker/auth_rotation.go @@ -12,7 +12,7 @@ import ( "time" berrors "github.com/hashicorp/boundary/internal/errors" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/nodeenrollment" "github.com/hashicorp/nodeenrollment/multihop" "github.com/hashicorp/nodeenrollment/types" diff --git a/internal/daemon/worker/controller_connection.go b/internal/daemon/worker/controller_connection.go index 3505db6fd..37dcf2075 100644 --- a/internal/daemon/worker/controller_connection.go +++ b/internal/daemon/worker/controller_connection.go @@ -28,8 +28,8 @@ import ( "github.com/hashicorp/boundary/internal/daemon/cluster/handlers" "github.com/hashicorp/boundary/internal/daemon/worker/internal/metric" "github.com/hashicorp/boundary/internal/errors" + "github.com/hashicorp/boundary/internal/event" pbs "github.com/hashicorp/boundary/internal/gen/controller/servers/services" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/server" "github.com/hashicorp/boundary/internal/util" "github.com/hashicorp/boundary/version" diff --git a/internal/daemon/worker/handler.go b/internal/daemon/worker/handler.go index cf12405bb..83ea6e0ba 100644 --- a/internal/daemon/worker/handler.go +++ b/internal/daemon/worker/handler.go @@ -20,8 +20,8 @@ import ( proxyHandlers "github.com/hashicorp/boundary/internal/daemon/worker/proxy" "github.com/hashicorp/boundary/internal/daemon/worker/session" "github.com/hashicorp/boundary/internal/errors" + "github.com/hashicorp/boundary/internal/event" pbs "github.com/hashicorp/boundary/internal/gen/controller/servers/services" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/proxy" "github.com/hashicorp/boundary/internal/util" "github.com/hashicorp/go-secure-stdlib/listenerutil" diff --git a/internal/daemon/worker/listeners.go b/internal/daemon/worker/listeners.go index 634f209ca..f53cc1924 100644 --- a/internal/daemon/worker/listeners.go +++ b/internal/daemon/worker/listeners.go @@ -21,7 +21,7 @@ import ( "github.com/hashicorp/boundary/internal/daemon/worker/internal/metric" "github.com/hashicorp/boundary/internal/daemon/worker/session" "github.com/hashicorp/boundary/internal/errors" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/internal/util" "github.com/hashicorp/go-multierror" nodee "github.com/hashicorp/nodeenrollment" diff --git a/internal/daemon/worker/session/session.go b/internal/daemon/worker/session/session.go index d088c228d..2bfe19267 100644 --- a/internal/daemon/worker/session/session.go +++ b/internal/daemon/worker/session/session.go @@ -12,8 +12,8 @@ import ( "sync" "time" + "github.com/hashicorp/boundary/internal/event" pbs "github.com/hashicorp/boundary/internal/gen/controller/servers/services" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/session" ) diff --git a/internal/daemon/worker/status.go b/internal/daemon/worker/status.go index 7ebab9ddf..a4df96ebf 100644 --- a/internal/daemon/worker/status.go +++ b/internal/daemon/worker/status.go @@ -12,9 +12,9 @@ import ( "github.com/hashicorp/boundary/internal/daemon/worker/common" "github.com/hashicorp/boundary/internal/daemon/worker/session" + "github.com/hashicorp/boundary/internal/event" pb "github.com/hashicorp/boundary/internal/gen/controller/servers" pbs "github.com/hashicorp/boundary/internal/gen/controller/servers/services" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/server" "github.com/hashicorp/boundary/version" "github.com/hashicorp/go-secure-stdlib/strutil" diff --git a/internal/daemon/worker/status_test.go b/internal/daemon/worker/status_test.go index aa8e26708..8b17dcfd5 100644 --- a/internal/daemon/worker/status_test.go +++ b/internal/daemon/worker/status_test.go @@ -11,7 +11,7 @@ import ( "time" "github.com/hashicorp/boundary/internal/cmd/base" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/go-hclog" "github.com/stretchr/testify/require" ) diff --git a/internal/daemon/worker/testing.go b/internal/daemon/worker/testing.go index 9d2199c80..227639fc5 100644 --- a/internal/daemon/worker/testing.go +++ b/internal/daemon/worker/testing.go @@ -18,8 +18,8 @@ import ( "github.com/hashicorp/boundary/internal/cmd/config" "github.com/hashicorp/boundary/internal/daemon/controller/common" "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/event" pbs "github.com/hashicorp/boundary/internal/gen/controller/servers/services" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/server" "github.com/hashicorp/boundary/internal/server/store" "github.com/hashicorp/boundary/internal/types/scope" diff --git a/internal/daemon/worker/worker.go b/internal/daemon/worker/worker.go index 972c2141c..64aadf66b 100644 --- a/internal/daemon/worker/worker.go +++ b/internal/daemon/worker/worker.go @@ -26,9 +26,9 @@ import ( "github.com/hashicorp/boundary/internal/daemon/worker/proxy" "github.com/hashicorp/boundary/internal/daemon/worker/session" "github.com/hashicorp/boundary/internal/errors" + "github.com/hashicorp/boundary/internal/event" pb "github.com/hashicorp/boundary/internal/gen/controller/servers" pbs "github.com/hashicorp/boundary/internal/gen/controller/servers/services" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/server" "github.com/hashicorp/boundary/internal/storage" boundary_plugin_assets "github.com/hashicorp/boundary/plugins/boundary" diff --git a/internal/db/db.go b/internal/db/db.go index d5415676d..3b8a0b085 100644 --- a/internal/db/db.go +++ b/internal/db/db.go @@ -11,7 +11,7 @@ import ( "time" "github.com/hashicorp/boundary/internal/errors" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/go-dbw" _ "github.com/jackc/pgx/v5" "gorm.io/driver/postgres" diff --git a/internal/db/read_writer_test.go b/internal/db/read_writer_test.go index 7cee74dd0..10b0020e2 100644 --- a/internal/db/read_writer_test.go +++ b/internal/db/read_writer_test.go @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/boundary/internal/db/db_test" "github.com/hashicorp/boundary/internal/db/timestamp" "github.com/hashicorp/boundary/internal/errors" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/internal/oplog" "github.com/hashicorp/boundary/internal/oplog/store" "github.com/hashicorp/go-hclog" diff --git a/internal/db/schema/manager.go b/internal/db/schema/manager.go index a66dbfb90..fd87ba4e2 100644 --- a/internal/db/schema/manager.go +++ b/internal/db/schema/manager.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/boundary/internal/db/schema/internal/provider" "github.com/hashicorp/boundary/internal/db/schema/migration" "github.com/hashicorp/boundary/internal/errors" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" ) // driver provides functionality to a database. diff --git a/internal/errors/error.go b/internal/errors/error.go index 9ba5998d6..d81158185 100644 --- a/internal/errors/error.go +++ b/internal/errors/error.go @@ -10,8 +10,8 @@ import ( "runtime" "strings" + "github.com/hashicorp/boundary/internal/event" pberrors "github.com/hashicorp/boundary/internal/gen/errors" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/jackc/pgx/v5/pgconn" ) diff --git a/internal/observability/event/audit_config.go b/internal/event/audit_config.go similarity index 100% rename from internal/observability/event/audit_config.go rename to internal/event/audit_config.go diff --git a/internal/observability/event/audit_config_test.go b/internal/event/audit_config_test.go similarity index 100% rename from internal/observability/event/audit_config_test.go rename to internal/event/audit_config_test.go diff --git a/internal/observability/event/cloudevents_formatter_node.go b/internal/event/cloudevents_formatter_node.go similarity index 100% rename from internal/observability/event/cloudevents_formatter_node.go rename to internal/event/cloudevents_formatter_node.go diff --git a/internal/observability/event/cloudevents_formatter_node_test.go b/internal/event/cloudevents_formatter_node_test.go similarity index 100% rename from internal/observability/event/cloudevents_formatter_node_test.go rename to internal/event/cloudevents_formatter_node_test.go diff --git a/internal/observability/event/common_keys_values.go b/internal/event/common_keys_values.go similarity index 100% rename from internal/observability/event/common_keys_values.go rename to internal/event/common_keys_values.go diff --git a/internal/observability/event/context.go b/internal/event/context.go similarity index 100% rename from internal/observability/event/context.go rename to internal/event/context.go diff --git a/internal/observability/event/context_test.go b/internal/event/context_test.go similarity index 99% rename from internal/observability/event/context_test.go rename to internal/event/context_test.go index b6baf3c1a..71dae61ec 100644 --- a/internal/observability/event/context_test.go +++ b/internal/event/context_test.go @@ -14,8 +14,8 @@ import ( "testing" "time" + "github.com/hashicorp/boundary/internal/event" pbs "github.com/hashicorp/boundary/internal/gen/testing/event" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/eventlogger/filters/encrypt" "github.com/hashicorp/eventlogger/formatter_filters/cloudevents" "github.com/hashicorp/go-hclog" diff --git a/internal/observability/event/context_unexported_test.go b/internal/event/context_unexported_test.go similarity index 100% rename from internal/observability/event/context_unexported_test.go rename to internal/event/context_unexported_test.go diff --git a/internal/observability/event/data_classification.go b/internal/event/data_classification.go similarity index 100% rename from internal/observability/event/data_classification.go rename to internal/event/data_classification.go diff --git a/internal/observability/event/data_classification_test.go b/internal/event/data_classification_test.go similarity index 100% rename from internal/observability/event/data_classification_test.go rename to internal/event/data_classification_test.go diff --git a/internal/observability/event/errors.go b/internal/event/errors.go similarity index 100% rename from internal/observability/event/errors.go rename to internal/event/errors.go diff --git a/internal/observability/event/event.go b/internal/event/event.go similarity index 100% rename from internal/observability/event/event.go rename to internal/event/event.go diff --git a/internal/observability/event/event_audit.go b/internal/event/event_audit.go similarity index 100% rename from internal/observability/event/event_audit.go rename to internal/event/event_audit.go diff --git a/internal/observability/event/event_audit_test.go b/internal/event/event_audit_test.go similarity index 100% rename from internal/observability/event/event_audit_test.go rename to internal/event/event_audit_test.go diff --git a/internal/observability/event/event_delivery_guarantee.go b/internal/event/event_delivery_guarantee.go similarity index 100% rename from internal/observability/event/event_delivery_guarantee.go rename to internal/event/event_delivery_guarantee.go diff --git a/internal/observability/event/event_delivery_guarantee_test.go b/internal/event/event_delivery_guarantee_test.go similarity index 100% rename from internal/observability/event/event_delivery_guarantee_test.go rename to internal/event/event_delivery_guarantee_test.go diff --git a/internal/observability/event/event_error.go b/internal/event/event_error.go similarity index 100% rename from internal/observability/event/event_error.go rename to internal/event/event_error.go diff --git a/internal/observability/event/event_error_test.go b/internal/event/event_error_test.go similarity index 100% rename from internal/observability/event/event_error_test.go rename to internal/event/event_error_test.go diff --git a/internal/observability/event/event_observation.go b/internal/event/event_observation.go similarity index 100% rename from internal/observability/event/event_observation.go rename to internal/event/event_observation.go diff --git a/internal/observability/event/event_observation_test.go b/internal/event/event_observation_test.go similarity index 100% rename from internal/observability/event/event_observation_test.go rename to internal/event/event_observation_test.go diff --git a/internal/observability/event/event_sys.go b/internal/event/event_sys.go similarity index 100% rename from internal/observability/event/event_sys.go rename to internal/event/event_sys.go diff --git a/internal/observability/event/event_sys_test.go b/internal/event/event_sys_test.go similarity index 100% rename from internal/observability/event/event_sys_test.go rename to internal/event/event_sys_test.go diff --git a/internal/observability/event/event_type.go b/internal/event/event_type.go similarity index 100% rename from internal/observability/event/event_type.go rename to internal/event/event_type.go diff --git a/internal/observability/event/eventer.go b/internal/event/eventer.go similarity index 100% rename from internal/observability/event/eventer.go rename to internal/event/eventer.go diff --git a/internal/observability/event/eventer_config.go b/internal/event/eventer_config.go similarity index 100% rename from internal/observability/event/eventer_config.go rename to internal/event/eventer_config.go diff --git a/internal/observability/event/eventer_config_test.go b/internal/event/eventer_config_test.go similarity index 100% rename from internal/observability/event/eventer_config_test.go rename to internal/event/eventer_config_test.go diff --git a/internal/observability/event/eventer_gate_test.go b/internal/event/eventer_gate_test.go similarity index 100% rename from internal/observability/event/eventer_gate_test.go rename to internal/event/eventer_gate_test.go diff --git a/internal/observability/event/eventer_retry.go b/internal/event/eventer_retry.go similarity index 100% rename from internal/observability/event/eventer_retry.go rename to internal/event/eventer_retry.go diff --git a/internal/observability/event/eventer_retry_test.go b/internal/event/eventer_retry_test.go similarity index 100% rename from internal/observability/event/eventer_retry_test.go rename to internal/event/eventer_retry_test.go diff --git a/internal/observability/event/eventer_test.go b/internal/event/eventer_test.go similarity index 100% rename from internal/observability/event/eventer_test.go rename to internal/event/eventer_test.go diff --git a/internal/observability/event/filter_operation.go b/internal/event/filter_operation.go similarity index 100% rename from internal/observability/event/filter_operation.go rename to internal/event/filter_operation.go diff --git a/internal/observability/event/filter_operation_test.go b/internal/event/filter_operation_test.go similarity index 100% rename from internal/observability/event/filter_operation_test.go rename to internal/event/filter_operation_test.go diff --git a/internal/observability/event/hclog_event_adapter.go b/internal/event/hclog_event_adapter.go similarity index 100% rename from internal/observability/event/hclog_event_adapter.go rename to internal/event/hclog_event_adapter.go diff --git a/internal/observability/event/hclog_event_adapter_test.go b/internal/event/hclog_event_adapter_test.go similarity index 100% rename from internal/observability/event/hclog_event_adapter_test.go rename to internal/event/hclog_event_adapter_test.go diff --git a/internal/observability/event/hclog_formatter_node.go b/internal/event/hclog_formatter_node.go similarity index 100% rename from internal/observability/event/hclog_formatter_node.go rename to internal/event/hclog_formatter_node.go diff --git a/internal/observability/event/hclog_formatter_node_test.go b/internal/event/hclog_formatter_node_test.go similarity index 100% rename from internal/observability/event/hclog_formatter_node_test.go rename to internal/event/hclog_formatter_node_test.go diff --git a/internal/observability/event/id.go b/internal/event/id.go similarity index 100% rename from internal/observability/event/id.go rename to internal/event/id.go diff --git a/internal/observability/event/id_test.go b/internal/event/id_test.go similarity index 100% rename from internal/observability/event/id_test.go rename to internal/event/id_test.go diff --git a/internal/observability/event/options.go b/internal/event/options.go similarity index 100% rename from internal/observability/event/options.go rename to internal/event/options.go diff --git a/internal/observability/event/options_test.go b/internal/event/options_test.go similarity index 100% rename from internal/observability/event/options_test.go rename to internal/event/options_test.go diff --git a/internal/observability/event/serialized_writer.go b/internal/event/serialized_writer.go similarity index 100% rename from internal/observability/event/serialized_writer.go rename to internal/event/serialized_writer.go diff --git a/internal/observability/event/serialized_writer_test.go b/internal/event/serialized_writer_test.go similarity index 100% rename from internal/observability/event/serialized_writer_test.go rename to internal/event/serialized_writer_test.go diff --git a/internal/observability/event/signer.go b/internal/event/signer.go similarity index 100% rename from internal/observability/event/signer.go rename to internal/event/signer.go diff --git a/internal/observability/event/sink_config.go b/internal/event/sink_config.go similarity index 100% rename from internal/observability/event/sink_config.go rename to internal/event/sink_config.go diff --git a/internal/observability/event/sink_config_test.go b/internal/event/sink_config_test.go similarity index 100% rename from internal/observability/event/sink_config_test.go rename to internal/event/sink_config_test.go diff --git a/internal/observability/event/sink_format.go b/internal/event/sink_format.go similarity index 100% rename from internal/observability/event/sink_format.go rename to internal/event/sink_format.go diff --git a/internal/observability/event/sink_type.go b/internal/event/sink_type.go similarity index 100% rename from internal/observability/event/sink_type.go rename to internal/event/sink_type.go diff --git a/internal/observability/event/testing.go b/internal/event/testing.go similarity index 100% rename from internal/observability/event/testing.go rename to internal/event/testing.go diff --git a/internal/observability/event/testing_test.go b/internal/event/testing_test.go similarity index 96% rename from internal/observability/event/testing_test.go rename to internal/event/testing_test.go index c66adaf3c..50caf863c 100644 --- a/internal/observability/event/testing_test.go +++ b/internal/event/testing_test.go @@ -12,7 +12,7 @@ import ( "os" "testing" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/eventlogger/formatter_filters/cloudevents" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/host/plugin/host.go b/internal/host/plugin/host.go index af3637e26..9dc238715 100644 --- a/internal/host/plugin/host.go +++ b/internal/host/plugin/host.go @@ -10,8 +10,8 @@ import ( "strings" "github.com/hashicorp/boundary/internal/db/timestamp" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/internal/host/plugin/store" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/oplog" "github.com/hashicorp/go-secure-stdlib/strutil" "google.golang.org/protobuf/proto" diff --git a/internal/host/plugin/job_set_sync.go b/internal/host/plugin/job_set_sync.go index 2067de4f9..a5fe1fa2a 100644 --- a/internal/host/plugin/job_set_sync.go +++ b/internal/host/plugin/job_set_sync.go @@ -10,9 +10,9 @@ import ( "github.com/hashicorp/boundary/internal/db" "github.com/hashicorp/boundary/internal/errors" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/libs/endpoint" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/oplog" "github.com/hashicorp/boundary/internal/scheduler" hcpb "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/hostcatalogs" diff --git a/internal/host/plugin/repository_host_catalog.go b/internal/host/plugin/repository_host_catalog.go index 23a43377f..68bfd311e 100644 --- a/internal/host/plugin/repository_host_catalog.go +++ b/internal/host/plugin/repository_host_catalog.go @@ -10,10 +10,10 @@ import ( "github.com/hashicorp/boundary/internal/db" "github.com/hashicorp/boundary/internal/errors" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/internal/host" "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/libs/patchstruct" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/oplog" plg "github.com/hashicorp/boundary/internal/plugin" "github.com/hashicorp/boundary/internal/scheduler" diff --git a/internal/scheduler/additional_verification_test.go b/internal/scheduler/additional_verification_test.go index 3208e84f0..a62b919b0 100644 --- a/internal/scheduler/additional_verification_test.go +++ b/internal/scheduler/additional_verification_test.go @@ -13,9 +13,9 @@ import ( "time" "github.com/hashicorp/boundary/internal/db" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/kms" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/scheduler/job" "github.com/hashicorp/go-hclog" "github.com/stretchr/testify/assert" diff --git a/internal/scheduler/scheduler.go b/internal/scheduler/scheduler.go index 55ce8b227..08e5c4d43 100644 --- a/internal/scheduler/scheduler.go +++ b/internal/scheduler/scheduler.go @@ -10,7 +10,7 @@ import ( "time" "github.com/hashicorp/boundary/internal/errors" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/internal/scheduler/job" ua "go.uber.org/atomic" ) diff --git a/internal/server/service_rotate_roots.go b/internal/server/service_rotate_roots.go index b4b5c713f..579e237dd 100644 --- a/internal/server/service_rotate_roots.go +++ b/internal/server/service_rotate_roots.go @@ -9,7 +9,7 @@ import ( "time" "github.com/hashicorp/boundary/internal/errors" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/nodeenrollment" "github.com/hashicorp/nodeenrollment/rotation" "github.com/hashicorp/nodeenrollment/types" diff --git a/internal/session/job_session_cleanup.go b/internal/session/job_session_cleanup.go index 4ece09ff9..946d6d175 100644 --- a/internal/session/job_session_cleanup.go +++ b/internal/session/job_session_cleanup.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/boundary/internal/db" "github.com/hashicorp/boundary/internal/errors" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/internal/scheduler" ) diff --git a/internal/session/repository_connection.go b/internal/session/repository_connection.go index 0ce7f3894..424be720e 100644 --- a/internal/session/repository_connection.go +++ b/internal/session/repository_connection.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/boundary/internal/db" "github.com/hashicorp/boundary/internal/errors" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/internal/kms" - "github.com/hashicorp/boundary/internal/observability/event" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/session/repository_session.go b/internal/session/repository_session.go index 3da14aa3a..2b8b63ae4 100644 --- a/internal/session/repository_session.go +++ b/internal/session/repository_session.go @@ -14,8 +14,8 @@ import ( "github.com/hashicorp/boundary/internal/db" "github.com/hashicorp/boundary/internal/db/timestamp" "github.com/hashicorp/boundary/internal/errors" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/internal/kms" - "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/util" wrapping "github.com/hashicorp/go-kms-wrapping/v2" ) diff --git a/internal/session/service_worker_status_report.go b/internal/session/service_worker_status_report.go index 3874ce85b..2b635025c 100644 --- a/internal/session/service_worker_status_report.go +++ b/internal/session/service_worker_status_report.go @@ -8,7 +8,7 @@ import ( "fmt" "github.com/hashicorp/boundary/internal/errors" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/go-multierror" ) diff --git a/internal/tests/api/authmethods/authenticate_test.go b/internal/tests/api/authmethods/authenticate_test.go index 2572774bb..a3caae500 100644 --- a/internal/tests/api/authmethods/authenticate_test.go +++ b/internal/tests/api/authmethods/authenticate_test.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/boundary/api/authtokens" "github.com/hashicorp/boundary/internal/cmd/config" "github.com/hashicorp/boundary/internal/daemon/controller" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" tests_api "github.com/hashicorp/boundary/internal/tests/api" "github.com/hashicorp/go-hclog" "github.com/stretchr/testify/assert" diff --git a/internal/tests/api/authmethods/authmethod_test.go b/internal/tests/api/authmethods/authmethod_test.go index 46260c969..4ac555c1e 100644 --- a/internal/tests/api/authmethods/authmethod_test.go +++ b/internal/tests/api/authmethods/authmethod_test.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/boundary/globals" "github.com/hashicorp/boundary/internal/cmd/config" "github.com/hashicorp/boundary/internal/daemon/controller" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" tests_api "github.com/hashicorp/boundary/internal/tests/api" capoidc "github.com/hashicorp/cap/oidc" "github.com/hashicorp/go-hclog" diff --git a/internal/tests/cluster/session_cleanup_test.go b/internal/tests/cluster/session_cleanup_test.go index 4dbee048e..c41023f93 100644 --- a/internal/tests/cluster/session_cleanup_test.go +++ b/internal/tests/cluster/session_cleanup_test.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/boundary/internal/daemon/controller" tg "github.com/hashicorp/boundary/internal/daemon/controller/handlers/targets" "github.com/hashicorp/boundary/internal/daemon/worker" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/internal/session" "github.com/hashicorp/boundary/internal/tests/helper" "github.com/hashicorp/dawdle" diff --git a/internal/tests/cluster/switch_kms_method_test.go b/internal/tests/cluster/switch_kms_method_test.go index ce1464fad..56a5732eb 100644 --- a/internal/tests/cluster/switch_kms_method_test.go +++ b/internal/tests/cluster/switch_kms_method_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/boundary/internal/cmd/config" "github.com/hashicorp/boundary/internal/daemon/controller" "github.com/hashicorp/boundary/internal/daemon/worker" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/internal/types/scope" "github.com/hashicorp/go-hclog" "github.com/stretchr/testify/assert" diff --git a/internal/tests/cluster/worker_proxy_test.go b/internal/tests/cluster/worker_proxy_test.go index 1e2fbd0e0..fa677d1d5 100644 --- a/internal/tests/cluster/worker_proxy_test.go +++ b/internal/tests/cluster/worker_proxy_test.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/boundary/internal/daemon/controller" tg "github.com/hashicorp/boundary/internal/daemon/controller/handlers/targets" "github.com/hashicorp/boundary/internal/daemon/worker" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/internal/tests/helper" "github.com/hashicorp/dawdle" "github.com/hashicorp/go-hclog" diff --git a/internal/tests/cluster/worker_replay_test.go b/internal/tests/cluster/worker_replay_test.go index 9fe2bec84..2a6587545 100644 --- a/internal/tests/cluster/worker_replay_test.go +++ b/internal/tests/cluster/worker_replay_test.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/boundary/internal/cmd/config" "github.com/hashicorp/boundary/internal/daemon/controller" "github.com/hashicorp/boundary/internal/daemon/worker" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/internal/server" "github.com/hashicorp/go-hclog" "github.com/stretchr/testify/require" diff --git a/internal/tests/cluster/x509_verification_test.go b/internal/tests/cluster/x509_verification_test.go index 597012c20..06ac011aa 100644 --- a/internal/tests/cluster/x509_verification_test.go +++ b/internal/tests/cluster/x509_verification_test.go @@ -21,7 +21,7 @@ import ( "github.com/hashicorp/boundary/internal/daemon/controller" tg "github.com/hashicorp/boundary/internal/daemon/controller/handlers/targets" "github.com/hashicorp/boundary/internal/daemon/worker" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" "github.com/hashicorp/boundary/internal/tests/helper" "github.com/hashicorp/go-hclog" "github.com/stretchr/testify/require" diff --git a/scripts/remove-gotags-comments/main.go b/scripts/remove-gotags-comments/main.go index 9b2e52db1..d81f7033b 100644 --- a/scripts/remove-gotags-comments/main.go +++ b/scripts/remove-gotags-comments/main.go @@ -11,7 +11,7 @@ import ( "log" "os" - "github.com/hashicorp/boundary/internal/observability/event" + "github.com/hashicorp/boundary/internal/event" ) var swaggerPath = flag.String("path", "", "The path to the swagger file to parse. Will also be written to")