remove layer

solarwinds · Jun 26, 2024 · e19c2e2 · e19c2e2
1 parent e6e32e1
commit e19c2e2
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 37 deletions.
diff --git a/internal/oboe/file_watcher.go b/internal/oboe/file_watcher.go
@@ -62,13 +62,7 @@ func (w *fileBasedWatcher) readSettingFromFile() {
 		"Got lambda settings from file:\n%+v",
 		s,
 	)
-	w.o.UpdateSetting(
-		s.layer,
-		s.flags,
-		s.value,
-		s.ttl,
-		s.args,
-	)
+	w.o.UpdateSetting(s.flags, s.value, s.ttl, s.args)
 }
 
 // Start runs a ticker that checks settings expiry from cache

diff --git a/internal/oboe/oboe.go b/internal/oboe/oboe.go
@@ -47,7 +47,7 @@ const (
 )
 
 type Oboe interface {
-	UpdateSetting(layer string, flags []byte, value int64, ttl int64, args map[string][]byte)
+	UpdateSetting(flags []byte, value int64, ttl int64, args map[string][]byte)
 	CheckSettingsTimeout()
 	GetSetting() *settings
 	RemoveSetting()
@@ -221,7 +221,7 @@ func adjustSampleRate(rate int64) int {
 	return int(rate)
 }
 
-func (o *oboe) UpdateSetting(layer string, flags []byte, value int64, ttl int64, args map[string][]byte) {
+func (o *oboe) UpdateSetting(flags []byte, value int64, ttl int64, args map[string][]byte) {
 	ns := newOboeSettings()
 
 	ns.timestamp = time.Now()
@@ -230,7 +230,6 @@ func (o *oboe) UpdateSetting(layer string, flags []byte, value int64, ttl int64,
 	ns.originalFlags = ns.flags
 	ns.value = adjustSampleRate(value)
 	ns.ttl = ttl
-	ns.layer = layer
 
 	ns.TriggerToken = args[constants.KvSignatureKey]
 

diff --git a/internal/oboe/settings.go b/internal/oboe/settings.go
@@ -33,7 +33,6 @@ type settings struct {
 	// The sample source after negotiating with local config
 	source                    SampleSource
 	ttl                       int64
-	layer                     string
 	TriggerToken              []byte
 	bucket                    *tokenBucket
 	triggerTraceRelaxedBucket *tokenBucket

diff --git a/internal/oboetestutils/oboe.go b/internal/oboetestutils/oboe.go
@@ -20,55 +20,39 @@ const TestToken = "TOKEN"
 const TypeDefault = 0
 
 type SettingUpdater interface {
-	UpdateSetting(layer string, flags []byte, value int64, ttl int64, args map[string][]byte)
+	UpdateSetting(flags []byte, value int64, ttl int64, args map[string][]byte)
 }
 
 func AddDefaultSetting(o SettingUpdater) {
 	// add default setting with 100% sampling
-	o.UpdateSetting("",
-		[]byte("SAMPLE_START,SAMPLE_THROUGH_ALWAYS,TRIGGER_TRACE"),
-		1000000, 120, utils.ArgsToMap(1000000, 1000000, 1000000, 1000000, 1000000, 1000000, -1, -1, []byte(TestToken)))
+	o.UpdateSetting([]byte("SAMPLE_START,SAMPLE_THROUGH_ALWAYS,TRIGGER_TRACE"), 1000000, 120, utils.ArgsToMap(1000000, 1000000, 1000000, 1000000, 1000000, 1000000, -1, -1, []byte(TestToken)))
 }
 
 func AddSampleThrough(o SettingUpdater) {
 	// add default setting with 100% sampling
-	o.UpdateSetting("",
-		[]byte("SAMPLE_START,SAMPLE_THROUGH,TRIGGER_TRACE"),
-		1000000, 120, utils.ArgsToMap(1000000, 1000000, 1000000, 1000000, 1000000, 1000000, -1, -1, []byte(TestToken)))
+	o.UpdateSetting([]byte("SAMPLE_START,SAMPLE_THROUGH,TRIGGER_TRACE"), 1000000, 120, utils.ArgsToMap(1000000, 1000000, 1000000, 1000000, 1000000, 1000000, -1, -1, []byte(TestToken)))
 }
 
 func AddNoTriggerTrace(o SettingUpdater) {
-	o.UpdateSetting("",
-		[]byte("SAMPLE_START,SAMPLE_THROUGH_ALWAYS"),
-		1000000, 120, utils.ArgsToMap(1000000, 1000000, 0, 0, 0, 0, -1, -1, []byte(TestToken)))
+	o.UpdateSetting([]byte("SAMPLE_START,SAMPLE_THROUGH_ALWAYS"), 1000000, 120, utils.ArgsToMap(1000000, 1000000, 0, 0, 0, 0, -1, -1, []byte(TestToken)))
 }
 
 func AddTriggerTraceOnly(o SettingUpdater) {
-	o.UpdateSetting("",
-		[]byte("TRIGGER_TRACE"),
-		0, 120, utils.ArgsToMap(0, 0, 1000000, 1000000, 1000000, 1000000, -1, -1, []byte(TestToken)))
+	o.UpdateSetting([]byte("TRIGGER_TRACE"), 0, 120, utils.ArgsToMap(0, 0, 1000000, 1000000, 1000000, 1000000, -1, -1, []byte(TestToken)))
 }
 
 func AddRelaxedTriggerTraceOnly(o SettingUpdater) {
-	o.UpdateSetting("",
-		[]byte("TRIGGER_TRACE"),
-		0, 120, utils.ArgsToMap(0, 0, 1000000, 1000000, 0, 0, -1, -1, []byte(TestToken)))
+	o.UpdateSetting([]byte("TRIGGER_TRACE"), 0, 120, utils.ArgsToMap(0, 0, 1000000, 1000000, 0, 0, -1, -1, []byte(TestToken)))
 }
 
 func AddStrictTriggerTraceOnly(o SettingUpdater) {
-	o.UpdateSetting("",
-		[]byte("TRIGGER_TRACE"),
-		0, 120, utils.ArgsToMap(0, 0, 0, 0, 1000000, 1000000, -1, -1, []byte(TestToken)))
+	o.UpdateSetting([]byte("TRIGGER_TRACE"), 0, 120, utils.ArgsToMap(0, 0, 0, 0, 1000000, 1000000, -1, -1, []byte(TestToken)))
 }
 
 func AddLimitedTriggerTrace(o SettingUpdater) {
-	o.UpdateSetting("",
-		[]byte("SAMPLE_START,SAMPLE_THROUGH_ALWAYS,TRIGGER_TRACE"),
-		1000000, 120, utils.ArgsToMap(1000000, 1000000, 1, 1, 1, 1, -1, -1, []byte(TestToken)))
+	o.UpdateSetting([]byte("SAMPLE_START,SAMPLE_THROUGH_ALWAYS,TRIGGER_TRACE"), 1000000, 120, utils.ArgsToMap(1000000, 1000000, 1, 1, 1, 1, -1, -1, []byte(TestToken)))
 }
 
 func AddDisabled(o SettingUpdater) {
-	o.UpdateSetting("",
-		[]byte(""),
-		0, 120, utils.ArgsToMap(0, 0, 1, 1, 1, 1, -1, -1, []byte(TestToken)))
+	o.UpdateSetting([]byte(""), 0, 120, utils.ArgsToMap(0, 0, 1, 1, 1, 1, -1, -1, []byte(TestToken)))
 }
diff --git a/internal/reporter/reporter_grpc.go b/internal/reporter/reporter_grpc.go
@@ -890,7 +890,7 @@ func (r *grpcReporter) getSettings() (*collector.SettingsResult, error) {
 // settings	new settings
 func (r *grpcReporter) updateSettings(settings *collector.SettingsResult) {
 	for _, s := range settings.GetSettings() {
-		r.oboe.UpdateSetting(string(s.Layer), s.Flags, s.Value, s.Ttl, s.Arguments)
+		r.oboe.UpdateSetting(s.Flags, s.Value, s.Ttl, s.Arguments)
 
 		// update MetricsFlushInterval
 		mi := ParseInt32(s.Arguments, constants.KvMetricsFlushInterval, r.collectMetricInterval)