remove unused code

Author: wonderflow

api/pkg/filtermanager/metricsconfigparser.go

@@ -33,7 +33,6 @@ var (
 	pluginTypes                = map[string]Plugin{}
 	plugins                    = map[string]Plugin{}
 	httpFilterFactoryAndParser = map[string]*FilterFactoryAndParser{}
-	metricsCounters            = map[string]capi.CounterMetric{}
 	metricsDefinitions         = map[string]MetricsRegister{}
 )
 
@@ -253,15 +252,3 @@ func RegisterMetricsDefinitions(pluginName string, definition MetricsRegister) {
 func GetMetricsDefinitions() map[string]MetricsRegister {
 	return metricsDefinitions
 }
-
-func RegisterCounterMetrics(name string) {
-	metricsCounters[name] = nil
-}
-
-func GetCounterMetricsForCallback() map[string]capi.CounterMetric {
-	return metricsCounters
-}
-
-func LoadCounterMetric(name string) capi.CounterMetric {
-	return metricsCounters[name]
-}

api/pkg/plugins/plugins.go

@@ -36,8 +36,6 @@ type bootstrap struct {
 	accessLogFormat  string
 	clusters         []map[string]interface{}
 
-	filterGolangForMetrics map[string]interface{}
-
 	dp *DataPlane
 }
 
@@ -46,8 +44,6 @@ func Bootstrap() *bootstrap {
 		backendRoutes: []map[string]interface{}{},
 		consumers:     map[string]map[string]interface{}{},
 		clusters:      []map[string]interface{}{},
-
-		filterGolangForMetrics: map[string]interface{}{},
 	}
 }
 
@@ -84,11 +80,6 @@ func (b *bootstrap) AddConsumer(name string, c map[string]interface{}) *bootstra
 	return b
 }
 
-func (b *bootstrap) AddFilterForGoMetrics(c map[string]interface{}) *bootstrap {
-	b.filterGolangForMetrics = c
-	return b
-}
-
 func (b *bootstrap) SetFilterGolang(cfg map[string]interface{}) *bootstrap {
 	b.httpFilterGolang = cfg
 	return b
@@ -153,27 +144,6 @@ func (b *bootstrap) buildConfiguration() (map[string]interface{}, error) {
 			}
 		}
 	}
-	if len(b.filterGolangForMetrics) > 0 {
-		wrapper := map[string]interface{}{
-			"@type": "type.googleapis.com/xds.type.v3.TypedStruct",
-			"value": b.filterGolangForMetrics,
-		}
-		var additionalFilters []interface{} = []interface{}{
-			map[string]interface{}{
-				"name":     "htnn.go.metrics",
-				"disabled": true,
-				"typed_config": map[string]interface{}{
-					"@type":         "type.googleapis.com/envoy.extensions.filters.http.golang.v3alpha.Config",
-					"library_path":  "/etc/libgolang.so",
-					"library_id":    "fm-metrics",
-					"plugin_name":   "fm-metrics",
-					"plugin_config": wrapper,
-				},
-			},
-		}
-		httpFilters = append(additionalFilters, httpFilters...)
-		hcm["http_filters"] = httpFilters
-	}
 
 	if b.accessLogFormat != "" {
 		accessLog := hcm["access_log"].([]interface{})[0].(map[string]interface{})["typed_config"].(map[string]interface{})

api/plugins/tests/integration/dataplane/bootstrap.go

@@ -25,7 +25,6 @@ import (
 	"path/filepath"
 	"strings"
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -346,16 +345,6 @@ func TestFilterManagerLogWithTrailers(t *testing.T) {
 func TestMetricsEnabledPlugin(t *testing.T) {
 	dp, err := dataplane.StartDataPlane(t, &dataplane.Option{
 		LogLevel: "debug",
-		/*
-			Bootstrap: dataplane.Bootstrap().AddFilterForGoMetrics(map[string]interface{}{
-				"plugins": []interface{}{
-					map[string]interface{}{
-						"name":   "onLog",
-						"config": map[string]interface{}{},
-					},
-				},
-			}),
-		*/
 	})
 	if err != nil {
 		t.Fatalf("failed to start data plane: %v", err)
@@ -402,5 +391,4 @@ func TestMetricsEnabledPlugin(t *testing.T) {
 		}
 	}
 	assert.Equal(t, 1, found, "expect to have metrics usage.counter and usage.gauge")
-	time.Sleep(5 * time.Minute)
 }

api/tests/integration/filtermanager_latest_test.go

@@ -28,7 +28,6 @@ import (
 
 func init() {
 	http.RegisterHttpFilterFactoryAndConfigParser("fm", filtermanager.FilterManagerFactory, &filtermanager.FilterManagerConfigParser{})
-	//http.RegisterHttpFilterFactoryAndConfigParser("fm-metrics", filtermanager.MetricsConfigFactory, &filtermanager.MetricsConfigParser{})
 	http.RegisterHttpFilterFactoryAndConfigParser("cm", consumer.ConsumerManagerFactory, &consumer.ConsumerManagerConfigParser{})
 	http.RegisterHttpFilterFactoryAndConfigParser("dc", dynamicconfig.DynamicConfigFactory, &dynamicconfig.DynamicConfigParser{})
 }