Fixed linter issues related to new version

grafana · Jan 31, 2025 · 1211278 · 1211278
1 parent 33d2fc0
commit 1211278
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 15 deletions.
diff --git a/cloudapi/logs.go b/cloudapi/logs.go
@@ -118,8 +118,6 @@ func (c *Config) logtailConn(ctx context.Context, referenceID string, since time
 
 // StreamLogsToLogger streams the logs for the configured test to the provided logger until ctx is
 // Done or an error occurs.
-//
-//nolint:funlen
 func (c *Config) StreamLogsToLogger(
 	ctx context.Context, logger logrus.FieldLogger, referenceID string, tailFrom time.Duration,
 ) error {

diff --git a/internal/cmd/ui.go b/internal/cmd/ui.go
@@ -164,7 +164,6 @@ func printExecutionDescription(
 	}
 }
 
-//nolint:funlen
 func renderMultipleBars(
 	nocolor, isTTY, goBack bool, maxLeft, termWidth, widthDelta int, pbs []*pb.ProgressBar,
 ) (string, int) {

diff --git a/internal/js/modules/k6/browser/browser/browser_mapping.go b/internal/js/modules/k6/browser/browser/browser_mapping.go
@@ -10,7 +10,9 @@ import (
 )
 
 // mapBrowser to the JS module.
-func mapBrowser(vu moduleVU) mapping { //nolint:funlen,gocognit
+//
+//nolint:gocognit
+func mapBrowser(vu moduleVU) mapping {
 	return mapping{
 		"context": func() (mapping, error) {
 			b, err := vu.browser()

diff --git a/internal/js/modules/k6/browser/common/element_handle.go b/internal/js/modules/k6/browser/common/element_handle.go
@@ -1618,7 +1618,7 @@ func (h *ElementHandle) newAction(
 	}
 }
 
-//nolint:funlen,gocognit
+//nolint:gocognit
 func (h *ElementHandle) newPointerAction(
 	fn elementHandlePointerActionFunc, opts *ElementHandleBasePointerOptions,
 ) func(apiCtx context.Context, resultCh chan any, errCh chan error) {

diff --git a/internal/js/modules/k6/browser/common/frame.go b/internal/js/modules/k6/browser/common/frame.go
@@ -1888,8 +1888,6 @@ func (f *Frame) WaitForLoadState(state string, opts sobek.Value) error {
 }
 
 // WaitForNavigation waits for the given navigation lifecycle event to happen.
-//
-//nolint:funlen
 func (f *Frame) WaitForNavigation(opts *FrameWaitForNavigationOptions) (*Response, error) {
 	f.log.Debugf("Frame:WaitForNavigation",
 		"fid:%s furl:%s", f.ID(), f.URL())

diff --git a/internal/js/modules/k6/browser/common/frame_session.go b/internal/js/modules/k6/browser/common/frame_session.go
@@ -225,7 +225,7 @@ func (fs *FrameSession) initDomains() error {
 	return nil
 }
 
-//nolint:funlen,cyclop
+//nolint:cyclop
 func (fs *FrameSession) initEvents() {
 	fs.logger.Debugf("NewFrameSession:initEvents",
 		"sid:%v tid:%v", fs.session.ID(), fs.targetID)

diff --git a/internal/js/modules/k6/browser/common/network_manager.go b/internal/js/modules/k6/browser/common/network_manager.go
@@ -193,7 +193,6 @@ func (m *NetworkManager) emitRequestMetrics(req *Request) {
 	})
 }
 
-//nolint:funlen
 func (m *NetworkManager) emitResponseMetrics(resp *Response, req *Request) {
 	state := m.vu.State()
 

diff --git a/internal/js/modules/k6/browser/common/screenshotter.go b/internal/js/modules/k6/browser/common/screenshotter.go
@@ -269,7 +269,6 @@ func getViewPortDimensions(ctx context.Context, sess session, logger *log.Logger
 	return visualViewportScale, visualViewportPageX, visualViewportPageY, nil
 }
 
-//nolint:funlen
 func (s *screenshotter) screenshotElement(h *ElementHandle, opts *ElementHandleScreenshotOptions) ([]byte, error) {
 	format := opts.Format
 	viewportSize, originalViewportSize, err := s.originalViewportSize(h.frame.page)

diff --git a/js/modules/k6/http/response.go b/js/modules/k6/http/response.go
@@ -134,8 +134,6 @@ func checkErrorInJSON(input []byte, offset int, err error) error {
 
 // SubmitForm parses the body as an html looking for a from and then submitting it
 // TODO: document the actual arguments that can be provided
-//
-//nolint:funlen
 func (res *Response) SubmitForm(args ...sobek.Value) (*Response, error) {
 	rt := res.client.moduleInstance.vu.Runtime()
 

diff --git a/lib/executor/ramping_vus.go b/lib/executor/ramping_vus.go
@@ -304,7 +304,7 @@ func (vlvc RampingVUsConfig) precalculateTheRequiredSteps(et *lib.ExecutionTuple
 // executorEndOffset, is not handled here. Instead GetExecutionRequirements()
 // takes care of that. But to make its job easier, this method won't add any
 // steps with an offset that's greater or equal to executorEndOffset.
-func (vlvc RampingVUsConfig) reserveVUsForGracefulRampDowns( //nolint:funlen
+func (vlvc RampingVUsConfig) reserveVUsForGracefulRampDowns(
 	rawSteps []lib.ExecutionStep, executorEndOffset time.Duration,
 ) []lib.ExecutionStep {
 	rawStepsLen := len(rawSteps)

diff --git a/lib/netext/httpext/transport.go b/lib/netext/httpext/transport.go
@@ -72,8 +72,6 @@ func newTransport(
 
 // Helper method to finish the tracer trail, assemble the tag values and emits
 // the metric samples for the supplied unfinished request.
-//
-//nolint:funlen
 func (t *transport) measureAndEmitMetrics(unfReq *unfinishedRequest) *finishedRequest {
 	trail := unfReq.tracer.Done()
-Original file line number
+Diff line change
@@ Expand Up / @@ -193,7 +193,6 @@ func (m *NetworkManager) emitRequestMetrics(req *Request) { @@
     	})
     }
-    //nolint:funlen
     func (m *NetworkManager) emitResponseMetrics(resp *Response, req *Request) {
     	state := m.vu.State()
@@ Expand Down @@