From 7feac20ceb43123e3f79c2b6d9e02b1c3695814d Mon Sep 17 00:00:00 2001
From: tammy-baylis-swi <tammy.baylis@solarwinds.com>
Date: Tue, 28 May 2024 12:21:30 -0700
Subject: [PATCH] Rm SampleSourceLayer

---
 internal/oboe/oboe.go     | 4 ++--
 internal/oboe/settings.go | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/internal/oboe/oboe.go b/internal/oboe/oboe.go
index 038683bc..8d302372 100644
--- 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
index 9f54b603..9d0bfe29 100644
--- 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
 	}