Fix linter error with updated linter

estesp · estesp · commit a1ae572a2778 · 2023-12-01T11:08:30.000-05:00
Signed-off-by: Phil Estes &lt;estesp@amazon.com&gt;
diff --git a/integration/util/util_windows.go b/integration/util/util_windows.go
@@ -117,9 +117,8 @@ func parseEndpoint(endpoint string) (string, string, error) {
 		return "npipe", fmt.Sprintf("//%s%s", host, u.Path), nil
 	} else if u.Scheme == "" {
 		return "", "", fmt.Errorf("Using %q as endpoint is deprecated, please consider using full url format", endpoint)
-	} else {
-		return u.Scheme, "", fmt.Errorf("protocol %q not supported", u.Scheme)
 	}
+	return u.Scheme, "", fmt.Errorf("protocol %q not supported", u.Scheme)
 }
 
 // LocalEndpoint empty implementation
diff --git a/tracing/plugin/otlp.go b/tracing/plugin/otlp.go
@@ -117,10 +117,9 @@ func newExporter(ctx context.Context, cfg *OTLPConfig) (*otlptrace.Exporter, err
 			opts = append(opts, otlptracegrpc.WithInsecure())
 		}
 		return otlptracegrpc.New(ctx, opts...)
-	} else {
-		// Other protocols such as "http/json" are not supported.
-		return nil, fmt.Errorf("OpenTelemetry protocol %q is not supported", cfg.Protocol)
 	}
+	// Other protocols such as "http/json" are not supported.
+	return nil, fmt.Errorf("OpenTelemetry protocol %q is not supported", cfg.Protocol)
 }
 
 // newTracer configures protocol-agonostic tracing settings such as

Original file line number	Diff line number	Diff line change
`@@ -117,9 +117,8 @@ func parseEndpoint(endpoint string) (string, string, error) {`
`117`	`117`	`return "npipe", fmt.Sprintf("//%s%s", host, u.Path), nil`
`118`	`118`	`} else if u.Scheme == "" {`
`119`	`119`	`return "", "", fmt.Errorf("Using %q as endpoint is deprecated, please consider using full url format", endpoint)`
`120`		`- } else {`
`121`		`- return u.Scheme, "", fmt.Errorf("protocol %q not supported", u.Scheme)`
`122`	`120`	`}`
	`121`	`+ return u.Scheme, "", fmt.Errorf("protocol %q not supported", u.Scheme)`
`123`	`122`	`}`
`124`	`123`
`125`	`124`	`// LocalEndpoint empty implementation`
Original file line number	Diff line number	Diff line change
`@@ -117,10 +117,9 @@ func newExporter(ctx context.Context, cfg OTLPConfig) (otlptrace.Exporter, err`
`117`	`117`	`opts = append(opts, otlptracegrpc.WithInsecure())`
`118`	`118`	`}`
`119`	`119`	`return otlptracegrpc.New(ctx, opts...)`
`120`		`- } else {`
`121`		`- // Other protocols such as "http/json" are not supported.`
`122`		`- return nil, fmt.Errorf("OpenTelemetry protocol %q is not supported", cfg.Protocol)`
`123`	`120`	`}`
	`121`	`+ // Other protocols such as "http/json" are not supported.`
	`122`	`+ return nil, fmt.Errorf("OpenTelemetry protocol %q is not supported", cfg.Protocol)`
`124`	`123`	`}`
`125`	`124`
`126`	`125`	`// newTracer configures protocol-agonostic tracing settings such as`