Address remaining review comments.

- use Name as the unique key to allow future extension to support multiple instances of the same type.
- remove GetSourceByName/Type.

Signed-off-by: Etai Lev Ran <[email protected]>

Author: elevran

pkg/epp/datalayer/datasource.go

@@ -66,22 +66,12 @@ func (dsr *DataSourceRegistry) Register(src DataSource) error {
 	if src == nil {
 		return errors.New("unable to register a nil data source")
 	}
-	if _, loaded := dsr.sources.LoadOrStore(src.TypedName().Type, src); loaded {
+	if _, loaded := dsr.sources.LoadOrStore(src.TypedName().Name, src); loaded {
 		return fmt.Errorf("unable to register duplicate data source: %s", src.TypedName().String())
 	}
 	return nil
 }
 
-// GetSourceByType fetches a source by type.
-func (dsr *DataSourceRegistry) GetSourceByType(dsType string) (DataSource, bool) {
-	if val, ok := dsr.sources.Load(dsType); ok {
-		if ds, ok := val.(DataSource); ok {
-			return ds, true
-		}
-	}
-	return nil, false
-}
-
 // GetSources returns all registered sources.
 func (dsr *DataSourceRegistry) GetSources() []DataSource {
 	var result []DataSource
@@ -101,21 +91,6 @@ func RegisterSource(src DataSource) error {
 	return defaultDataSources.Register(src)
 }
 
-// GetSourceByType returns a typed data source from the default registry.
-func GetSourceByType[T DataSource](dsType string) (T, bool) {
-	v, ok := defaultDataSources.GetSourceByType(dsType)
-	if !ok {
-		var zero T
-		return zero, false
-	}
-	src, ok := v.(T)
-	if !ok {
-		var zero T
-		return zero, false
-	}
-	return src, true
-}
-
 // GetSources returns the list of data sources registered in the default registry.
 func GetSources() []DataSource {
 	return defaultDataSources.GetSources()

pkg/epp/datalayer/datasource_test.go

@@ -53,11 +53,6 @@ func TestRegisterAndGetSource(t *testing.T) {
 	err = reg.Register(nil)
 	assert.Error(t, err, "expected error on nil")
 
-	// Get by type
-	got, found := reg.GetSourceByType(testType)
-	assert.True(t, found, "expected to find registered data source")
-	assert.Equal(t, testType, got.TypedName().Type)
-
 	// Get all sources
 	all := reg.GetSources()
 	assert.Len(t, all, 1)
@@ -67,21 +62,16 @@ func TestRegisterAndGetSource(t *testing.T) {
 	err = RegisterSource(ds)
 	assert.NoError(t, err, "expected no error on registration")
 
-	// Get by type
-	got, found = GetSourceByType[*mockDataSource](testType)
-	assert.True(t, found, "expected to find registered data source")
-	assert.Equal(t, testType, got.TypedName().Type)
-
 	// Get all sources
 	all = GetSources()
 	assert.Len(t, all, 1)
 	assert.Equal(t, testType, all[0].TypedName().Type)
 }
 
-func TestGetNamedSourceWhenNotFound(t *testing.T) {
+func TestGetSourceWhenNoneAreRegistered(t *testing.T) {
 	reg := DataSourceRegistry{}
-	_, found := reg.GetSourceByType("missing")
-	assert.False(t, found, "expected source to be missing")
+	found := reg.GetSources()
+	assert.Empty(t, found, "expected no sources to be returned")
 }
 
 func TestValidateExtractorType(t *testing.T) {

pkg/epp/datalayer/metrics/datasource.go

@@ -90,7 +90,7 @@ func (dataSrc *DataSource) AddExtractor(extractor datalayer.Extractor) error {
 	if err := datalayer.ValidateExtractorType(PrometheusMetricType, extractor.ExpectedInputType()); err != nil {
 		return err
 	}
-	if _, loaded := dataSrc.extractors.LoadOrStore(extractor.TypedName().Type, extractor); loaded {
+	if _, loaded := dataSrc.extractors.LoadOrStore(extractor.TypedName().Name, extractor); loaded {
 		return fmt.Errorf("attempt to add duplicate extractor %s to %s", extractor.TypedName(), dataSrc.TypedName())
 	}
 	return nil