[chore]: fix staticcheck rules (cmd, scraper, testbed) (open-telemetry#39198)

#### Description

This fixes staticcheck issues in cmd, scraper and testbed discovered
after golangci-lint@v2 upgrade

Signed-off-by: Matthieu MOREL <[email protected]>

Author: mmorel-35

cmd/telemetrygen/pkg/logs/logs.go

@@ -153,27 +153,27 @@ func parseSeverity(severityText string, severityNumber int32) (string, log.Sever
 	// severity number should match well-known severityText
 	switch severityText {
 	case plog.SeverityNumberTrace.String():
-		if !(severityNumber >= 1 && severityNumber <= 4) {
+		if severityNumber < 1 || severityNumber > 4 {
 			return "", 0, fmt.Errorf("severity text %q does not match severity number %d, the valid range is [1,4]", severityText, severityNumber)
 		}
 	case plog.SeverityNumberDebug.String():
-		if !(severityNumber >= 5 && severityNumber <= 8) {
+		if severityNumber < 5 || severityNumber > 8 {
 			return "", 0, fmt.Errorf("severity text %q does not match severity number %d, the valid range is [5,8]", severityText, severityNumber)
 		}
 	case plog.SeverityNumberInfo.String():
-		if !(severityNumber >= 9 && severityNumber <= 12) {
+		if severityNumber < 9 || severityNumber > 12 {
 			return "", 0, fmt.Errorf("severity text %q does not match severity number %d, the valid range is [9,12]", severityText, severityNumber)
 		}
 	case plog.SeverityNumberWarn.String():
-		if !(severityNumber >= 13 && severityNumber <= 16) {
+		if severityNumber < 13 || severityNumber > 16 {
 			return "", 0, fmt.Errorf("severity text %q does not match severity number %d, the valid range is [13,16]", severityText, severityNumber)
 		}
 	case plog.SeverityNumberError.String():
-		if !(severityNumber >= 17 && severityNumber <= 20) {
+		if severityNumber < 17 || severityNumber > 20 {
 			return "", 0, fmt.Errorf("severity text %q does not match severity number %d, the valid range is [17,20]", severityText, severityNumber)
 		}
 	case plog.SeverityNumberFatal.String():
-		if !(severityNumber >= 21 && severityNumber <= 24) {
+		if severityNumber < 21 || severityNumber > 24 {
 			return "", 0, fmt.Errorf("severity text %q does not match severity number %d, the valid range is [21,24]", severityText, severityNumber)
 		}
 	}

scraper/zookeeperscraper/config.go

@@ -17,6 +17,6 @@ type Config struct {
 }
 
 func (cfg *Config) Validate() error {
-	_, _, err := net.SplitHostPort(cfg.TCPAddrConfig.Endpoint)
+	_, _, err := net.SplitHostPort(cfg.Endpoint)
 	return err
 }

scraper/zookeeperscraper/scraper_test.go

@@ -285,9 +285,9 @@ func TestZookeeperMetricsScraperScrape(t *testing.T) {
 			}
 
 			cfg := createDefaultConfig().(*Config)
-			cfg.TCPAddrConfig.Endpoint = localAddr
+			cfg.Endpoint = localAddr
 			if tt.metricsConfig != nil {
-				cfg.MetricsBuilderConfig.Metrics = tt.metricsConfig()
+				cfg.Metrics = tt.metricsConfig()
 			}
 
 			core, observedLogs := observer.New(zap.DebugLevel)

testbed/datareceivers/jaeger.go

@@ -33,7 +33,7 @@ func NewJaegerDataReceiver(port int) testbed.DataReceiver {
 func (jr *jaegerDataReceiver) Start(tc consumer.Traces, _ consumer.Metrics, _ consumer.Logs) error {
 	factory := jaegerreceiver.NewFactory()
 	cfg := factory.CreateDefaultConfig().(*jaegerreceiver.Config)
-	cfg.Protocols.GRPC = &configgrpc.ServerConfig{
+	cfg.GRPC = &configgrpc.ServerConfig{
 		NetAddr: confignet.AddrConfig{Endpoint: fmt.Sprintf("127.0.0.1:%d", jr.Port), Transport: confignet.TransportTypeTCP},
 	}
 	var err error

testbed/datareceivers/sapm.go

@@ -56,10 +56,8 @@ func (sr *SapmDataReceiver) Stop() error {
 
 // GenConfigYAMLStr returns exporter config for the agent.
 func (sr *SapmDataReceiver) GenConfigYAMLStr() string {
-	disableCompression := false
-	if sr.compression == "" {
-		disableCompression = true
-	}
+	disableCompression := sr.compression == ""
+
 	// Note that this generates an exporter config for agent.
 	return fmt.Sprintf(`
   sapm:

testbed/datasenders/zipkin.go

@@ -38,7 +38,7 @@ func (zs *zipkinDataSender) Start() error {
 	cfg := factory.CreateDefaultConfig().(*zipkinexporter.Config)
 	cfg.Endpoint = fmt.Sprintf("http://%s/api/v2/spans", zs.GetEndpoint())
 	// Disable retries, we should push data and if error just log it.
-	cfg.BackOffConfig.Enabled = false
+	cfg.Enabled = false
 	// Disable sending queue, we should push data from the caller goroutine.
 	cfg.QueueSettings.Enabled = false
 	params := exportertest.NewNopSettings(factory.Type())