adjust logic + add tests

Author: wbrowne

backend/instancemgmt/instance_manager.go

@@ -18,9 +18,6 @@ var (
 		Name:      "active_instances",
 		Help:      "The number of active plugin instances",
 	})
-)
-
-const (
 	disposeTTL = 5 * time.Second
 )
 

backend/instancemgmt/instance_manager_test.go

@@ -44,6 +44,11 @@ func TestInstanceManager(t *testing.T) {
 					Updated: time.Now(),
 				},
 			}
+			origDisposeTTL := disposeTTL
+			disposeTTL = time.Millisecond
+			t.Cleanup(func() {
+				disposeTTL = origDisposeTTL
+			})
 			newInstance, err := im.Get(ctx, pCtxUpdated)
 
 			t.Run("New instance should be created", func(t *testing.T) {
@@ -66,44 +71,6 @@ func TestInstanceManager(t *testing.T) {
 	})
 }
 
-func TestInstanceManagerExpiration(t *testing.T) {
-	ctx := context.Background()
-	pCtx := backend.PluginContext{
-		OrgID: 1,
-		AppInstanceSettings: &backend.AppInstanceSettings{
-			Updated: time.Now(),
-		},
-	}
-
-	tip := &testInstanceProvider{}
-	im := newTTLInstanceManager(tip, time.Millisecond, 2*time.Millisecond)
-
-	instance, err := im.Get(ctx, pCtx)
-	require.NoError(t, err)
-	require.NotNil(t, instance)
-	require.Equal(t, pCtx.OrgID, instance.(*testInstance).orgID)
-	require.Equal(t, pCtx.AppInstanceSettings.Updated, instance.(*testInstance).updated)
-
-	t.Run("After expiration", func(t *testing.T) {
-		instance.(*testInstance).wg.Wait()
-		require.True(t, instance.(*testInstance).disposed.Load())
-		require.Equal(t, int64(1), instance.(*testInstance).disposedTimes.Load())
-
-		newInstance, err := im.Get(ctx, pCtx)
-
-		t.Run("New instance should be created", func(t *testing.T) {
-			require.NoError(t, err)
-			require.NotNil(t, newInstance)
-			require.Equal(t, pCtx.OrgID, newInstance.(*testInstance).orgID)
-			require.Equal(t, pCtx.AppInstanceSettings.Updated, newInstance.(*testInstance).updated)
-		})
-
-		t.Run("New instance should not be the same as old instance", func(t *testing.T) {
-			require.NotSame(t, instance, newInstance)
-		})
-	})
-}
-
 func TestInstanceManagerConcurrency(t *testing.T) {
 	t.Run("Check possible race condition issues when initially creating instance", func(t *testing.T) {
 		ctx := context.Background()
@@ -144,6 +111,12 @@ func TestInstanceManagerConcurrency(t *testing.T) {
 	})
 
 	t.Run("Check possible race condition issues when re-creating instance on settings update", func(t *testing.T) {
+		origDisposeTTL := disposeTTL
+		disposeTTL = time.Millisecond
+		t.Cleanup(func() {
+			disposeTTL = origDisposeTTL
+		})
+
 		ctx := context.Background()
 		initialPCtx := backend.PluginContext{
 			OrgID: 1,
@@ -152,7 +125,7 @@ func TestInstanceManagerConcurrency(t *testing.T) {
 			},
 		}
 		tip := &testInstanceProvider{}
-		im := newTTLInstanceManager(tip, defaultInstanceTTL, defaultInstanceCleanupInterval)
+		im := New(tip)
 		// Creating initial instance with old contexts
 		instanceToDispose, _ := im.Get(ctx, initialPCtx)
 

backend/instancemgmt/intance_manager_ttl.go

@@ -11,8 +11,8 @@ import (
 )
 
 const (
-	defaultInstanceTTL             = 24 * time.Hour
-	defaultInstanceCleanupInterval = 48 * time.Hour
+	defaultInstanceTTL             = 1 * time.Hour
+	defaultInstanceCleanupInterval = 2 * time.Hour
 )
 
 // NewTTLInstanceManager creates a new instance manager with TTL-based caching.
@@ -69,6 +69,7 @@ func (im *instanceManagerWithTTL) Get(ctx context.Context, pluginContext backend
 		needsUpdate := im.provider.NeedsUpdate(ctx, pluginContext, ci)
 
 		if !needsUpdate {
+			im.cache.SetDefault(cacheKey, ci)
 			return ci.instance, nil
 		}
 	}
@@ -81,6 +82,7 @@ func (im *instanceManagerWithTTL) Get(ctx context.Context, pluginContext backend
 		needsUpdate := im.provider.NeedsUpdate(ctx, pluginContext, ci)
 
 		if !needsUpdate {
+			im.cache.SetDefault(cacheKey, ci)
 			return ci.instance, nil
 		}