Skip to content

Commit 5abf5bd

Browse files
committed
remove extra logs and fix test
1 parent dd12883 commit 5abf5bd

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

api/pkg/filtermanager/api_impl.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,10 +215,6 @@ func (cb *filterManagerCallbackHandler) GetCounterMetrics(pluginName, metricName
215215
api.LogErrorf("metrics not exist or not initialized for plugin %s", pluginName)
216216
return nil
217217
}
218-
api.LogInfo("[metrics] printing:")
219-
for k, v := range cb.metrics {
220-
api.LogInfof("[metrics] %s: %v", k, v)
221-
}
222218
writer, ok := cb.metrics[pluginName]
223219
if !ok {
224220
api.LogErrorf("metrics writer for plugin %s not found", pluginName)

api/pkg/filtermanager/config.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"fmt"
2121
"reflect"
2222
"sort"
23+
"strings"
2324
"sync"
2425

2526
xds "github.com/cncf/xds/go/xds/type/v3"
@@ -96,7 +97,6 @@ func (conf *filterManagerConfig) Merge(another *filterManagerConfig) *filterMana
9697
}
9798

9899
// Pass LDS metrics writers to the merged config for golang filter to use at route level
99-
capi.LogInfof("[metrics] merging http filter, filtermanager config: %+v", another.metricsWriters)
100100
conf.metricsWriters = another.metricsWriters
101101

102102
// It's tough to do the data plane merge right. We don't use shallow copy, which may share
@@ -192,11 +192,13 @@ func (p *FilterManagerConfigParser) Parse(any *anypb.Any, callbacks capi.ConfigC
192192
// If callbacks is not nil, it means this filter is configured in the LDS level.
193193
// We need to initialize the metrics for all golang plugins here.
194194
registers := plugins.GetMetricsDefinitions()
195+
registeredPlugins := []string{}
195196
for pluginName, register := range registers {
196-
api.LogInfof("initializing metrics for plugin %s", pluginName)
197+
api.LogInfof("registering metrics for golang plugin %s", pluginName)
197198
metricsWriters[pluginName] = register(callbacks)
199+
registeredPlugins = append(registeredPlugins, pluginName)
198200
}
199-
capi.LogInfof("[metrics] initialized http filter, filtermanager config: %+v", metricsWriters)
201+
capi.LogInfof("metrics registered for plugins: [%s]", strings.Join(registeredPlugins, ", "))
200202
}
201203

202204
// No configuration

api/pkg/filtermanager/filtermanager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ func FilterManagerFactory(c interface{}, cb capi.FilterCallbackHandler) (streamF
152152
}
153153

154154
fm.callbacks.FilterCallbackHandler = cb
155-
capi.LogInfof("[metrics] filter manager metrics Writers %v", conf.metricsWriters)
155+
156156
fm.callbacks.metrics = conf.metricsWriters
157157

158158
canSkipMethods := fm.canSkipMethods

api/plugins/tests/pkg/envoy/capi.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,13 @@ func (i *filterCallbackHandler) PluginState() api.PluginState {
583583
return i.pluginState
584584
}
585585

586+
func (i *filterCallbackHandler) GetCounterMetrics(pluginName, metricsName string) capi.CounterMetric {
587+
return nil
588+
}
589+
func (i *filterCallbackHandler) GetGaugeMetrics(pluginName, metricsName string) capi.GaugeMetric {
590+
return nil
591+
}
592+
586593
func (i *filterCallbackHandler) WithLogArg(key string, value any) api.StreamFilterCallbacks {
587594
return i
588595
}

0 commit comments

Comments
 (0)