chore: remove toggle for requestID

superseriousbusiness · May 7, 2023 · af967e2 · af967e2
1 parent 3184773
commit af967e2
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 38 deletions.
diff --git a/cmd/gotosocial/action/server/server.go b/cmd/gotosocial/action/server/server.go
@@ -153,9 +153,8 @@ var Start action.GTSAction = func(ctx context.Context) error {
 		return fmt.Errorf("error creating router: %s", err)
 	}
 
-	middlewares := []gin.HandlerFunc{}
-	if config.GetRequestIDEnabled() {
-		middlewares = append(middlewares, middleware.AddRequestID(config.GetRequestIDHeader()))
+	middlewares := []gin.HandlerFunc{
+		middleware.AddRequestID(config.GetRequestIDHeader()), // requestID middleware must run before tracing
 	}
 	if config.GetTracingEnabled() {
 		middlewares = append(middlewares, tracing.InstrumentGin())

diff --git a/cmd/gotosocial/action/testrig/testrig.go b/cmd/gotosocial/action/testrig/testrig.go
@@ -98,9 +98,8 @@ var Start action.GTSAction = func(ctx context.Context) error {
 	*/
 
 	router := testrig.NewTestRouter(state.DB)
-	middlewares := []gin.HandlerFunc{}
-	if config.GetRequestIDEnabled() {
-		middlewares = append(middlewares, middleware.AddRequestID(config.GetRequestIDHeader()))
+	middlewares := []gin.HandlerFunc{
+		middleware.AddRequestID(config.GetRequestIDHeader()), // requestID middleware must run before tracing
 	}
 	if config.GetTracingEnabled() {
 		middlewares = append(middlewares, tracing.InstrumentGin())

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -157,8 +157,7 @@ type Configuration struct {
 	AdminTransPath        string `name:"path" usage:"the path of the file to import from/export to"`
 	AdminMediaPruneDryRun bool   `name:"dry-run" usage:"perform a dry run and only log number of items eligible for pruning"`
 
-	RequestIDEnabled bool   `name:"request-id-enabled" usage:"Enable the usage of a request id header which can be passed by external proxies."`
-	RequestIDHeader  string `name:"request-id-header" usage:"Header to extract the Request ID from. Eg.,'X-Request-Id'."`
+	RequestIDHeader string `name:"request-id-header" usage:"Header to extract the Request ID from. Eg.,'X-Request-Id'."`
 }
 
 type CacheConfiguration struct {

diff --git a/internal/config/defaults.go b/internal/config/defaults.go
@@ -196,6 +196,5 @@ var Defaults = Configuration{
 
 	AdminMediaPruneDryRun: true,
 
-	RequestIDEnabled: true,
-	RequestIDHeader:  "X-Request-Id",
+	RequestIDHeader: "X-Request-Id",
 }
diff --git a/internal/config/helpers.gen.go b/internal/config/helpers.gen.go
@@ -3630,31 +3630,6 @@ func GetAdminMediaPruneDryRun() bool { return global.GetAdminMediaPruneDryRun()
 // SetAdminMediaPruneDryRun safely sets the value for global configuration 'AdminMediaPruneDryRun' field
 func SetAdminMediaPruneDryRun(v bool) { global.SetAdminMediaPruneDryRun(v) }
 
-// GetRequestIDEnabled safely fetches the Configuration value for state's 'RequestIDEnabled' field
-func (st *ConfigState) GetRequestIDEnabled() (v bool) {
-	st.mutex.Lock()
-	v = st.config.RequestIDEnabled
-	st.mutex.Unlock()
-	return
-}
-
-// SetRequestIDEnabled safely sets the Configuration value for state's 'RequestIDEnabled' field
-func (st *ConfigState) SetRequestIDEnabled(v bool) {
-	st.mutex.Lock()
-	defer st.mutex.Unlock()
-	st.config.RequestIDEnabled = v
-	st.reloadToViper()
-}
-
-// RequestIDEnabledFlag returns the flag name for the 'RequestIDEnabled' field
-func RequestIDEnabledFlag() string { return "request-id-enabled" }
-
-// GetRequestIDEnabled safely fetches the value for global configuration 'RequestIDEnabled' field
-func GetRequestIDEnabled() bool { return global.GetRequestIDEnabled() }
-
-// SetRequestIDEnabled safely sets the value for global configuration 'RequestIDEnabled' field
-func SetRequestIDEnabled(v bool) { global.SetRequestIDEnabled(v) }
-
 // GetRequestIDHeader safely fetches the Configuration value for state's 'RequestIDHeader' field
 func (st *ConfigState) GetRequestIDHeader() (v string) {
 	st.mutex.Lock()

diff --git a/test/envparsing.sh b/test/envparsing.sh
@@ -124,7 +124,6 @@ EXPECT=$(cat <<"EOF"
     "path": "",
     "port": 6969,
     "protocol": "http",
-    "request-id-enabled": true,
     "request-id-header": "X-Trace-Id",
     "smtp-disclose-recipients": true,
     "smtp-from": "[email protected]",

diff --git a/testrig/config.go b/testrig/config.go
@@ -118,8 +118,6 @@ var testDefaults = config.Configuration{
 	TracingTransport:         "grpc",
 	TracingInsecureTransport: true,
 
-	RequestIDEnabled: true,
-
 	SyslogEnabled:  false,
 	SyslogProtocol: "udp",
 	SyslogAddress:  "localhost:514",