Merge pull request #95 from solarwinds/NH-81286-only-default-setting

NH-81286 Remove TypeLayer and SampleSourceLayer
solarwinds · May 29, 2024 · 9759b88 · 9759b88
2 parents 0178a69 + 7feac20
commit 9759b88
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/internal/oboe/oboe.go b/internal/oboe/oboe.go
@@ -43,7 +43,6 @@ const (
 	SampleSourceNone
 	SampleSourceFile
 	SampleSourceDefault
-	SampleSourceLayer
 )
 
 type Oboe interface {
@@ -272,7 +271,7 @@ func (o *oboe) GetSetting() (*settings, bool) {
 	o.RLock()
 	defer o.RUnlock()
 
-	// for now only look up the default settings
+	// always use the default setting
 	key := settingKey{
 		sType: TypeDefault,
 		layer: "",
@@ -288,6 +287,7 @@ func (o *oboe) RemoveSetting() {
 	o.Lock()
 	defer o.Unlock()
 
+	// always use the default setting
 	key := settingKey{
 		sType: TypeDefault,
 		layer: "",

diff --git a/internal/oboe/settings.go b/internal/oboe/settings.go
@@ -15,9 +15,10 @@
 package oboe
 
 import (
+	"time"
+
 	"github.com/solarwinds/apm-go/internal/config"
 	"github.com/solarwinds/apm-go/internal/log"
-	"time"
 )
 
 type settings struct {
@@ -132,8 +133,7 @@ type settingFlag uint16
 
 // setting types
 const (
-	TypeDefault settingType = iota // default setting which serves as a fallback if no other settings found
-	TypeLayer                      // layer specific settings
+	TypeDefault settingType = iota // default setting and the only accepted setting
 )
 
 // setting flags offset
@@ -174,8 +174,6 @@ func (st settingType) toSampleSource() SampleSource {
 	switch st {
 	case TypeDefault:
 		source = SampleSourceDefault
-	case TypeLayer:
-		source = SampleSourceLayer
 	default:
 		source = SampleSourceNone
 	}