Remove unnnecessary RetrieveEnd func, avoid using session (open-telem…

…etry#888)

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>

internal/configsource/envvarconfigsource/source.go

@@ -81,10 +81,6 @@ func (e *envVarConfigSource) Retrieve(_ context.Context, selector string, params
 	return configprovider.NewRetrieved(defaultValue), nil
 }
 
-func (e *envVarConfigSource) RetrieveEnd(context.Context) error {
-	return nil
-}
-
 func (e *envVarConfigSource) Close(context.Context) error {
 	return nil
 }

internal/configsource/envvarconfigsource/source_test.go

@@ -85,17 +85,16 @@ func TestEnvVarConfigSource_Session(t *testing.T) {
 				defaults = make(map[string]interface{})
 			}
 
-			s := &envVarConfigSource{
+			source := &envVarConfigSource{
 				defaults: defaults,
 			}
 
 			ctx := context.Background()
 			defer func() {
-				assert.NoError(t, s.RetrieveEnd(ctx))
-				assert.NoError(t, s.Close(ctx))
+				assert.NoError(t, source.Close(ctx))
 			}()
 
-			r, err := s.Retrieve(ctx, tt.selector, config.NewMapFromStringMap(tt.params))
+			r, err := source.Retrieve(ctx, tt.selector, config.NewMapFromStringMap(tt.params))
 			if tt.wantErr != nil {
 				assert.Nil(t, r)
 				require.IsType(t, tt.wantErr, err)

internal/configsource/etcd2configsource/source.go

@@ -61,7 +61,7 @@ func newConfigSource(params configprovider.CreateParams, cfg *Config) (configsou
 	}, nil
 }
 
-func (s *etcd2ConfigSource) Retrieve(ctx context.Context, selector string, paramsConfigMap *config.Map) (configsource.Retrieved, error) {
+func (s *etcd2ConfigSource) Retrieve(ctx context.Context, selector string, _ *config.Map) (configsource.Retrieved, error) {
 	resp, err := s.kapi.Get(ctx, selector, nil)
 	if err != nil {
 		return nil, err
@@ -73,10 +73,6 @@ func (s *etcd2ConfigSource) Retrieve(ctx context.Context, selector string, param
 	return configprovider.NewWatchableRetrieved(resp.Node.Value, s.newWatcher(watchCtx, selector, resp.Node.ModifiedIndex)), nil
 }
 
-func (s *etcd2ConfigSource) RetrieveEnd(context.Context) error {
-	return nil
-}
-
 func (s *etcd2ConfigSource) Close(context.Context) error {
 	for _, cancel := range s.closeFuncs {
 		cancel()

internal/configsource/etcd2configsource/source_test.go

@@ -38,7 +38,7 @@ func TestSessionRetrieve(t *testing.T) {
 		},
 	}
 
-	session := &etcd2ConfigSource{logger: logger, kapi: kapi}
+	source := &etcd2ConfigSource{logger: logger, kapi: kapi}
 	testsCases := []struct {
 		params interface{}
 		expect *string
@@ -52,7 +52,7 @@ func TestSessionRetrieve(t *testing.T) {
 
 	for _, c := range testsCases {
 		t.Run(c.name, func(t *testing.T) {
-			retrieved, err := session.Retrieve(context.Background(), c.key, nil)
+			retrieved, err := source.Retrieve(context.Background(), c.key, nil)
 			if c.expect != nil {
 				assert.NoError(t, err)
 				_, okWatcher := retrieved.(configsource.Watchable)
@@ -61,8 +61,7 @@ func TestSessionRetrieve(t *testing.T) {
 			}
 			assert.Error(t, err)
 			assert.Nil(t, retrieved)
-			assert.NoError(t, session.RetrieveEnd(context.Background()))
-			assert.NoError(t, session.Close(context.Background()))
+			assert.NoError(t, source.Close(context.Background()))
 		})
 	}
 }
@@ -78,7 +77,7 @@ func TestWatcher(t *testing.T) {
 		close  bool
 	}{
 		{name: "updated", close: false, result: "v", err: nil},
-		{name: "session-closed", close: true, result: "", err: nil},
+		{name: "source-closed", close: true, result: "", err: nil},
 		{name: "client-error", close: false, result: "", err: errors.New("client error")},
 	}
 
@@ -87,8 +86,8 @@ func TestWatcher(t *testing.T) {
 			watcher := newMockWatcher()
 			kapi.activeWatcher = watcher
 
-			session := &etcd2ConfigSource{logger: logger, kapi: kapi}
-			retrieved, err := session.Retrieve(context.Background(), "k1", nil)
+			source := &etcd2ConfigSource{logger: logger, kapi: kapi}
+			retrieved, err := source.Retrieve(context.Background(), "k1", nil)
 			assert.NoError(t, err)
 			assert.NotNil(t, retrieved.Value)
 			retrievedWatcher, okWatcher := retrieved.(configsource.Watchable)
@@ -98,7 +97,7 @@ func TestWatcher(t *testing.T) {
 			go func() {
 				switch {
 				case c.close:
-					session.Close(context.Background())
+					source.Close(context.Background())
 				case c.err != nil:
 					watcher.errors <- c.err
 				case c.result != "":

internal/configsource/includeconfigsource/source.go

@@ -85,10 +85,6 @@ func (is *includeConfigSource) Retrieve(_ context.Context, selector string, para
 	return configprovider.NewWatchableRetrieved(buf.Bytes(), watchForUpdateFn), nil
 }
 
-func (is *includeConfigSource) RetrieveEnd(context.Context) error {
-	return nil
-}
-
 func (is *includeConfigSource) Close(context.Context) error {
 	if is.watcher != nil {
 		return is.watcher.Close()

internal/configsource/includeconfigsource/source_test.go

@@ -59,17 +59,17 @@ func TestIncludeConfigSource_Session(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			s, err := newConfigSource(configprovider.CreateParams{}, &Config{})
+			source, err := newConfigSource(configprovider.CreateParams{}, &Config{})
 			require.NoError(t, err)
-			require.NotNil(t, s)
+			require.NotNil(t, source)
 
 			ctx := context.Background()
 			defer func() {
-				assert.NoError(t, s.Close(ctx))
+				assert.NoError(t, source.Close(ctx))
 			}()
 
 			file := path.Join("testdata", tt.selector)
-			r, err := s.Retrieve(ctx, file, config.NewMapFromStringMap(tt.params))
+			r, err := source.Retrieve(ctx, file, config.NewMapFromStringMap(tt.params))
 			if tt.wantErr != nil {
 				assert.Nil(t, r)
 				require.IsType(t, tt.wantErr, err)
@@ -121,13 +121,13 @@ func TestIncludeConfigSource_DeleteFileError(t *testing.T) {
 		t.Skip("Windows only test")
 	}
 
-	s, err := newConfigSource(configprovider.CreateParams{}, &Config{DeleteFiles: true})
+	source, err := newConfigSource(configprovider.CreateParams{}, &Config{DeleteFiles: true})
 	require.NoError(t, err)
-	require.NotNil(t, s)
+	require.NotNil(t, source)
 
 	ctx := context.Background()
 	defer func() {
-		assert.NoError(t, s.Close(ctx))
+		assert.NoError(t, source.Close(ctx))
 	}()
 
 	// Copy test file
@@ -143,7 +143,7 @@ func TestIncludeConfigSource_DeleteFileError(t *testing.T) {
 		assert.NoError(t, os.Remove(dst))
 	})
 
-	r, err := s.Retrieve(ctx, dst, nil)
+	r, err := source.Retrieve(ctx, dst, nil)
 	assert.IsType(t, &errFailedToDeleteFile{}, err)
 	assert.Nil(t, r)
 }

internal/configsource/vaultconfigsource/source.go

@@ -114,10 +114,6 @@ func (v *vaultConfigSource) Retrieve(_ context.Context, selector string, _ *conf
 	return configprovider.NewWatchableRetrieved(value, watchForUpdateFn), nil
 }
 
-func (v *vaultConfigSource) RetrieveEnd(context.Context) error {
-	return nil
-}
-
 func (v *vaultConfigSource) Close(context.Context) error {
 	close(v.doneCh)