Enable confusing-naming rule

.golangci.yml

@@ -65,6 +65,8 @@ linters-settings:
         disabled: false
       - name: early-return
         disabled: false
+      - name: confusing-naming
+        disabled: false
 
 issues:
   exclude-rules:

pkg/osquery/table/platform_tables.go

@@ -9,8 +9,8 @@ import (
 	"github.com/osquery/osquery-go/plugin/table"
 )
 
-// platformTables returns an empty set. It's here as a catchall for
+// platformSpecificTables returns an empty set. It's here as a catchall for
 // unimplemented platforms.
-func platformTables(client *osquery.ExtensionManagerClient, logger log.Logger, currentOsquerydBinaryPath string) []*table.Plugin {
+func platformSpecificTables(client *osquery.ExtensionManagerClient, logger log.Logger, currentOsquerydBinaryPath string) []*table.Plugin {
 	return []*table.Plugin{}
 }

pkg/osquery/table/platform_tables_darwin.go

@@ -37,7 +37,7 @@ const (
 	screenlockQuery    = "select enabled, grace_period from screenlock"
 )
 
-func platformTables(logger log.Logger, currentOsquerydBinaryPath string) []osquery.OsqueryPlugin {
+func platformSpecificTables(logger log.Logger, currentOsquerydBinaryPath string) []osquery.OsqueryPlugin {
 	munki := munki.New()
 
 	// This table uses undocumented APIs, There is some discussion at the

pkg/osquery/table/platform_tables_linux.go

@@ -28,7 +28,7 @@ import (
 	osquery "github.com/osquery/osquery-go"
 )
 
-func platformTables(logger log.Logger, currentOsquerydBinaryPath string) []osquery.OsqueryPlugin {
+func platformSpecificTables(logger log.Logger, currentOsquerydBinaryPath string) []osquery.OsqueryPlugin {
 	return []osquery.OsqueryPlugin{
 		cryptsetup.TablePlugin(logger),
 		gsettings.Settings(logger),

pkg/osquery/table/platform_tables_windows.go

@@ -17,7 +17,7 @@ import (
 	osquery "github.com/osquery/osquery-go"
 )
 
-func platformTables(logger log.Logger, currentOsquerydBinaryPath string) []osquery.OsqueryPlugin {
+func platformSpecificTables(logger log.Logger, currentOsquerydBinaryPath string) []osquery.OsqueryPlugin {
 	return []osquery.OsqueryPlugin{
 		ProgramIcons(),
 		dsim_default_associations.TablePlugin(logger),

pkg/osquery/table/table.go

@@ -60,7 +60,7 @@ func PlatformTables(logger log.Logger, currentOsquerydBinaryPath string) []osque
 	tables = append(tables, dataflattentable.AllTablePlugins(logger)...)
 
 	// add in the platform specific ones (as denoted by build tags)
-	tables = append(tables, platformTables(logger, currentOsquerydBinaryPath)...)
+	tables = append(tables, platformSpecificTables(logger, currentOsquerydBinaryPath)...)
 
 	return tables
 }

pkg/traces/traces.go

@@ -27,7 +27,7 @@ const (
 // ending the span. `keyVals` should be a list of pairs, where the first in the pair is a
 // string representing the attribute key and the second in the pair is the attribute value.
 func StartHttpRequestSpan(r *http.Request, keyVals ...interface{}) (*http.Request, trace.Span) {
-	ctx, span := startSpan(r.Context(), keyVals...)
+	ctx, span := startSpanWithExtractedAttributes(r.Context(), keyVals...)
 	return r.WithContext(ctx), span
 }
 
@@ -36,12 +36,12 @@ func StartHttpRequestSpan(r *http.Request, keyVals ...interface{}) (*http.Reques
 // ending the span. `keyVals` should be a list of pairs, where the first in the pair is a
 // string representing the attribute key and the second in the pair is the attribute value.
 func StartSpan(ctx context.Context, keyVals ...interface{}) (context.Context, trace.Span) {
-	return startSpan(ctx, keyVals...)
+	return startSpanWithExtractedAttributes(ctx, keyVals...)
 }
 
-// startSpan is the internal implementation of StartSpan and StartHttpRequestSpan with runtime.Caller(2)
-// so that the caller of the wrapper function is used.
-func startSpan(ctx context.Context, keyVals ...interface{}) (context.Context, trace.Span) {
+// startSpanWithExtractedAttributes is the internal implementation of StartSpan and StartHttpRequestSpan
+// with runtime.Caller(2) so that the caller of the wrapper function is used.
+func startSpanWithExtractedAttributes(ctx context.Context, keyVals ...interface{}) (context.Context, trace.Span) {
 	spanName := defaultSpanName
 
 	opts := make([]trace.SpanStartOption, 0)