diff --git a/spinifex/daemon/heartbeat_test.go b/spinifex/daemon/heartbeat_test.go index d3e401c94..4176525f8 100644 --- a/spinifex/daemon/heartbeat_test.go +++ b/spinifex/daemon/heartbeat_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/mulgadc/spinifex/spinifex/config" - "github.com/mulgadc/spinifex/spinifex/instancecache" + "github.com/mulgadc/spinifex/spinifex/runtime/compute/cache" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/daemon/instance_recovery.go b/spinifex/daemon/instance_recovery.go index 1147f8989..f494f45db 100644 --- a/spinifex/daemon/instance_recovery.go +++ b/spinifex/daemon/instance_recovery.go @@ -11,9 +11,9 @@ import ( "time" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - handlers_ec2_instance "github.com/mulgadc/spinifex/spinifex/handlers/ec2/instance" - "github.com/mulgadc/spinifex/spinifex/instancecache" "github.com/mulgadc/spinifex/spinifex/foundation/telemetry" + handlers_ec2_instance "github.com/mulgadc/spinifex/spinifex/handlers/ec2/instance" + "github.com/mulgadc/spinifex/spinifex/runtime/compute/cache" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" diff --git a/spinifex/daemon/instance_recovery_test.go b/spinifex/daemon/instance_recovery_test.go index faa7a04ce..319436307 100644 --- a/spinifex/daemon/instance_recovery_test.go +++ b/spinifex/daemon/instance_recovery_test.go @@ -15,11 +15,11 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/config" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/resource" handlers_ec2_instance "github.com/mulgadc/spinifex/spinifex/handlers/ec2/instance" - "github.com/mulgadc/spinifex/spinifex/instancecache" + "github.com/mulgadc/spinifex/spinifex/runtime/compute/cache" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/gateway/ec2/instance/status_synthesis.go b/spinifex/gateway/ec2/instance/status_synthesis.go index 5f6df3198..7d5e4588c 100644 --- a/spinifex/gateway/ec2/instance/status_synthesis.go +++ b/spinifex/gateway/ec2/instance/status_synthesis.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" handlers_ec2_instance "github.com/mulgadc/spinifex/spinifex/handlers/ec2/instance" - "github.com/mulgadc/spinifex/spinifex/instancecache" + "github.com/mulgadc/spinifex/spinifex/runtime/compute/cache" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" ) diff --git a/spinifex/gateway/ec2/instance/status_synthesis_test.go b/spinifex/gateway/ec2/instance/status_synthesis_test.go index 07f399eff..1faa9b401 100644 --- a/spinifex/gateway/ec2/instance/status_synthesis_test.go +++ b/spinifex/gateway/ec2/instance/status_synthesis_test.go @@ -11,9 +11,9 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/mulgadc/spinifex/spinifex/instancecache" - "github.com/mulgadc/spinifex/spinifex/utils" + "github.com/mulgadc/spinifex/spinifex/runtime/compute/cache" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" + "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/require" ) diff --git a/spinifex/instancecache/cache.go b/spinifex/runtime/compute/cache/cache.go similarity index 100% rename from spinifex/instancecache/cache.go rename to spinifex/runtime/compute/cache/cache.go diff --git a/spinifex/instancecache/cache_test.go b/spinifex/runtime/compute/cache/cache_test.go similarity index 100% rename from spinifex/instancecache/cache_test.go rename to spinifex/runtime/compute/cache/cache_test.go diff --git a/spinifex/instancecache/export_test.go b/spinifex/runtime/compute/cache/export_test.go similarity index 100% rename from spinifex/instancecache/export_test.go rename to spinifex/runtime/compute/cache/export_test.go diff --git a/spinifex/instancecache/liveness.go b/spinifex/runtime/compute/cache/liveness.go similarity index 100% rename from spinifex/instancecache/liveness.go rename to spinifex/runtime/compute/cache/liveness.go diff --git a/spinifex/instancecache/liveness_test.go b/spinifex/runtime/compute/cache/liveness_test.go similarity index 98% rename from spinifex/instancecache/liveness_test.go rename to spinifex/runtime/compute/cache/liveness_test.go index 6b5db3a86..7491885ac 100644 --- a/spinifex/instancecache/liveness_test.go +++ b/spinifex/runtime/compute/cache/liveness_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/instancecache" - "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" + "github.com/mulgadc/spinifex/spinifex/runtime/compute/cache" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/require" ) diff --git a/spinifex/instancecache/metrics.go b/spinifex/runtime/compute/cache/metrics.go similarity index 94% rename from spinifex/instancecache/metrics.go rename to spinifex/runtime/compute/cache/metrics.go index dc8027adb..18367abb3 100644 --- a/spinifex/instancecache/metrics.go +++ b/spinifex/runtime/compute/cache/metrics.go @@ -9,7 +9,9 @@ import ( "go.opentelemetry.io/otel/metric" ) -// meterName is the instrumentation scope for every instancecache metric. +// meterName deliberately preserves the pre-move instrumentation scope. It is +// an observable telemetry identity, not a Go import path; changing it would +// split existing time series at a structural-only move. const meterName = "github.com/mulgadc/spinifex/spinifex/instancecache" // cacheMetrics holds one Cache's instruments. Registered per instance, not as diff --git a/spinifex/instancecache/resume_from_revision_test.go b/spinifex/runtime/compute/cache/resume_from_revision_test.go similarity index 100% rename from spinifex/instancecache/resume_from_revision_test.go rename to spinifex/runtime/compute/cache/resume_from_revision_test.go index 9ad455394..5bf2bad41 100644 --- a/spinifex/instancecache/resume_from_revision_test.go +++ b/spinifex/runtime/compute/cache/resume_from_revision_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/require" diff --git a/spinifex/services/awsgw/awsgw.go b/spinifex/services/awsgw/awsgw.go index 176c8f22e..4941e5d6b 100644 --- a/spinifex/services/awsgw/awsgw.go +++ b/spinifex/services/awsgw/awsgw.go @@ -35,9 +35,9 @@ import ( handlers_ochrevector "github.com/mulgadc/spinifex/spinifex/handlers/ochrevector" handlers_quota "github.com/mulgadc/spinifex/spinifex/handlers/quota" handlers_sts "github.com/mulgadc/spinifex/spinifex/handlers/sts" - "github.com/mulgadc/spinifex/spinifex/instancecache" "github.com/mulgadc/spinifex/spinifex/network/reconcile" "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/runtime/compute/cache" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go"