Skip to content

Commit 486b17a

Browse files
deepsource-autofix[bot]deepsource-autofix[bot]
authored
style: format code with Go fmt and Gofumpt
This commit fixes the style issues introduced in 73d0aff according to the output from Go fmt and Gofumpt. Details: #1
1 parent 73d0aff commit 486b17a

17 files changed

+36
-45
lines changed

‎config/lura.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@ const (
1515
Namespace = "telemetry/opentelemetry"
1616
)
1717

18-
var (
19-
// ErrNoConfig is used to signal no config was found
20-
ErrNoConfig = errors.New("No config found for opentelemetry")
21-
)
18+
// ErrNoConfig is used to signal no config was found
19+
var ErrNoConfig = errors.New("No config found for opentelemetry")
2220

2321
// FromLura extracts the configuration from the Lura's ServiceConfig
2422
// "extra_config" field.

‎config/path_pattern.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ import (
55
"strings"
66
)
77

8-
var (
9-
templatedURLPattern = regexp.MustCompile(`{{\.(.*?)}}`)
10-
)
8+
var templatedURLPattern = regexp.MustCompile(`{{\.(.*?)}}`)
119

1210
func NormalizeURLPattern(u string) string {
1311
s := templatedURLPattern.ReplaceAllStringFunc(u,

‎example/server/main.go

-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ func main() {
7878
logger, _ := logging.NewLogger(*logLevel, os.Stdout, "[KRAKEND]")
7979

8080
obsConfig, err := kotelconfig.FromLura(serviceConfig)
81-
8281
if err != nil {
8382
fmt.Printf("ERROR: no config found for open telemetry: %s\n", err.Error())
8483
return

‎http/client/client_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -174,14 +174,14 @@ func TestInstrumentedHTTPClient(t *testing.T) {
174174
for _, m := range sm.Metrics {
175175
gotMetrics[m.Name] = m
176176
}
177-
for k, _ := range wantedMetrics {
177+
for k := range wantedMetrics {
178178
if _, ok := gotMetrics[k]; !ok {
179179
t.Errorf("missing metric %s", k)
180180
return
181181
}
182182
}
183183
// check that we do not have not expected metrics:
184-
for k, _ := range gotMetrics {
184+
for k := range gotMetrics {
185185
if _, ok := wantedMetrics[k]; !ok {
186186
t.Errorf("got unexpected metric %s", k)
187187
return
@@ -210,5 +210,4 @@ func TestInstrumentedHTTPClient(t *testing.T) {
210210
t.Errorf("metric size, want: %d, got: %d", len(payload), dp.Value)
211211
return
212212
}
213-
214213
}

‎http/client/transport.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ type Transport struct {
7373
}
7474

7575
func readWrapperBuilder(metricsOpts *TransportMetricsOptions, tracesOpts *TransportTracesOptions,
76-
meter metric.Meter, tracer trace.Tracer) readerWrapperFn {
77-
76+
meter metric.Meter, tracer trace.Tracer,
77+
) readerWrapperFn {
7878
if !metricsOpts.ReadPayload && !tracesOpts.ReadPayload {
7979
// no metrics or traces for the payload reading
8080
return func(r io.Reader, ctx context.Context) io.ReadCloser {
@@ -109,8 +109,8 @@ func readWrapperBuilder(metricsOpts *TransportMetricsOptions, tracesOpts *Transp
109109

110110
// NewRoundTripper creates an instrumented round tripper.
111111
func NewRoundTripper(base http.RoundTripper, metricsOpts TransportMetricsOptions,
112-
tracesOpts TransportTracesOptions, spanName string, stateGetter state.GetterFn) http.RoundTripper {
113-
112+
tracesOpts TransportTracesOptions, spanName string, stateGetter state.GetterFn,
113+
) http.RoundTripper {
114114
rt := newTransport(base, metricsOpts, tracesOpts, spanName, stateGetter)
115115
if rt == nil {
116116
return base
@@ -119,8 +119,8 @@ func NewRoundTripper(base http.RoundTripper, metricsOpts TransportMetricsOptions
119119
}
120120

121121
func newTransport(base http.RoundTripper, metricsOpts TransportMetricsOptions,
122-
tracesOpts TransportTracesOptions, spanName string, stateGetter state.GetterFn) *Transport {
123-
122+
tracesOpts TransportTracesOptions, spanName string, stateGetter state.GetterFn,
123+
) *Transport {
124124
if !tracesOpts.Enabled() && !metricsOpts.Enabled() {
125125
return nil
126126
}

‎http/client/transport_traces.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ func newTransportTraces(tracesOpts *TransportTracesOptions, tracer trace.Tracer,
4444
}
4545

4646
func (t *transportTraces) start(rtt *roundTripTracking,
47-
propagator propagation.TextMapPropagator) {
48-
47+
propagator propagation.TextMapPropagator,
48+
) {
4949
if t == nil || rtt.req == nil {
5050
return
5151
}

‎http/client/transport_tracking.go

-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ func (t *roundTripTracking) withClientTrace() {
5858
// WroteRequest: t.WroteRequest,
5959
}
6060
t.req = t.req.WithContext(httptrace.WithClientTrace(t.req.Context(), httpTrace))
61-
6261
}
6362

6463
// GetConn is called before a connection is created or

‎io/instruments.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ type instruments struct {
6868
// create a meter or something ..
6969
func newInstruments(prefix string,
7070
attrT []attribute.KeyValue, attrM []attribute.KeyValue,
71-
tracer trace.Tracer, meter metric.Meter) *instruments {
72-
71+
tracer trace.Tracer, meter metric.Meter,
72+
) *instruments {
7373
if prefix == "" {
7474
prefix = "io-"
7575
}

‎io/reader.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ type instrumentedReader struct {
2323
// an instrumented reader. Is better than the [NewIntrumentedReader] call because
2424
// the instruments here are only created once.
2525
func NewInstrumentedReaderFactory(attrT []attribute.KeyValue, attrM []attribute.KeyValue,
26-
tracer trace.Tracer, meter metric.Meter) func(io.Reader, context.Context) *instrumentedReader {
26+
tracer trace.Tracer, meter metric.Meter,
27+
) func(io.Reader, context.Context) *instrumentedReader {
2728
instr := newInstruments("readed-", attrT, attrM, tracer, meter)
2829

2930
return func(r io.Reader, ctx context.Context) *instrumentedReader {
@@ -45,8 +46,8 @@ func NewInstrumentedReaderFactory(attrT []attribute.KeyValue, attrM []attribute.
4546
// Is better to use [NewInstrumentedReaderFactory].
4647
func NewInstrumentedReader(r io.Reader, ctx context.Context,
4748
attrT []attribute.KeyValue, attrM []attribute.KeyValue,
48-
tracer trace.Tracer, meter metric.Meter) *instrumentedReader {
49-
49+
tracer trace.Tracer, meter metric.Meter,
50+
) *instrumentedReader {
5051
return NewInstrumentedReaderFactory(attrT, attrM, tracer, meter)(r, ctx)
5152
}
5253

‎io/reader_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func TestReaderHappyPath(t *testing.T) {
9999
for _, m := range sm.Metrics {
100100
gotMetrics[m.Name] = m
101101
}
102-
for k, _ := range wantedMetrics {
102+
for k := range wantedMetrics {
103103
if _, ok := gotMetrics[k]; !ok {
104104
t.Errorf("missing metric %s", k)
105105
return
@@ -225,7 +225,7 @@ func TestReaderTimeout(t *testing.T) {
225225
for _, m := range sm.Metrics {
226226
gotMetrics[m.Name] = m
227227
}
228-
for k, _ := range wantedMetrics {
228+
for k := range wantedMetrics {
229229
if _, ok := gotMetrics[k]; !ok {
230230
t.Errorf("missing metric %s", k)
231231
return

‎io/writer.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ type instrumentedWriter struct {
3232
// an instrumented writer. Is better than the [NewIntrumentedWriter] call because
3333
// the instruments here are only created once.
3434
func NewInstrumentedWriterFactory(attrT []attribute.KeyValue, attrM []attribute.KeyValue,
35-
tracer trace.Tracer, meter metric.Meter) func(io.Writer, context.Context) *instrumentedWriter {
35+
tracer trace.Tracer, meter metric.Meter,
36+
) func(io.Writer, context.Context) *instrumentedWriter {
3637
instr := newInstruments("written-", attrT, attrM, tracer, meter)
3738

3839
return func(w io.Writer, ctx context.Context) *instrumentedWriter {
@@ -50,8 +51,8 @@ func NewInstrumentedWriterFactory(attrT []attribute.KeyValue, attrM []attribute.
5051
// Is better to use [NewInstrumentedWriterFactory].
5152
func NewInstrumentedWriter(w io.Writer, ctx context.Context,
5253
attrT []attribute.KeyValue, attrM []attribute.KeyValue,
53-
tracer trace.Tracer, meter metric.Meter) *instrumentedWriter {
54-
54+
tracer trace.Tracer, meter metric.Meter,
55+
) *instrumentedWriter {
5556
return NewInstrumentedWriterFactory(attrT, attrM, tracer, meter)(w, ctx)
5657
}
5758

‎io/writer_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func TestWriterHappyPath(t *testing.T) {
114114
for _, m := range sm.Metrics {
115115
gotMetrics[m.Name] = m
116116
}
117-
for k, _ := range wantedMetrics {
117+
for k := range wantedMetrics {
118118
if _, ok := gotMetrics[k]; !ok {
119119
t.Errorf("missing metric %s", k)
120120
return

‎lura/backend.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ var (
4343
// HTTPRequestExecutorFromConfig creates an HTTPRequestExecutor to be used
4444
// for the backend requests.
4545
func HTTPRequestExecutorFromConfig(clientFactory transport.HTTPClientFactory,
46-
cfg *config.Backend, opts *otelconfig.BackendOpts) transport.HTTPRequestExecutor {
47-
46+
cfg *config.Backend, opts *otelconfig.BackendOpts,
47+
) transport.HTTPRequestExecutor {
4848
if !opts.Enabled() {
4949
// no configuration for the backend, then .. no metrics nor tracing:
5050
return transport.DefaultHTTPRequestExecutor(clientFactory)

‎otel.go

+3-5
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ import (
2626
"github.com/krakend/krakend-otel/state"
2727
)
2828

29-
var (
30-
otelState state.OTELState
31-
)
29+
var otelState state.OTELState
3230

3331
// Register all the known exporter factories (opentelemetry, prometheus, etc..)
3432
// and uses the proviced ServiceConfig to instantiate the configured exporters.
@@ -69,10 +67,10 @@ func Register(ctx context.Context, srvCfg lconfig.ServiceConfig) error {
6967
TraceSampleRate: 1.0,
7068
TraceProviders: make([]string, 0, len(te)),
7169
}
72-
for mk, _ := range me {
70+
for mk := range me {
7371
cfg.Instance.MetricProviders = append(cfg.Instance.MetricProviders, mk)
7472
}
75-
for tk, _ := range te {
73+
for tk := range te {
7674
cfg.Instance.TraceProviders = append(cfg.Instance.TraceProviders, tk)
7775
}
7876
}

‎router/gin/endpoint_traces.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ type ginTraces struct {
2424
}
2525

2626
func newGinTraces(tracesOpts *ginTracesOptions, tracer trace.Tracer,
27-
endpoint string, prop propagation.TextMapPropagator) *ginTraces {
28-
27+
endpoint string, prop propagation.TextMapPropagator,
28+
) *ginTraces {
2929
if tracesOpts.DisablePropagation {
3030
prop = nil
3131
}

‎state/global.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ var (
99
otelState *OTELState
1010
)
1111

12-
var (
13-
_ GetterFn = GlobalState
14-
)
12+
var _ GetterFn = GlobalState
1513

1614
// GlobalState retrieves a configured global state
1715
func GlobalState() OTEL {

‎state/state.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ func New(cfg config.Config) (*OTELState, error) {
5858
// NewWithVersion create a new OTELState with a version for
5959
// the KrakenD service, with the provided metrics and traces exporters
6060
func NewWithVersion(serviceName string, cfg config.Instance, version string,
61-
me map[string]exporter.MetricReader, te map[string]exporter.SpanExporter) (*OTELState, error) {
62-
61+
me map[string]exporter.MetricReader, te map[string]exporter.SpanExporter,
62+
) (*OTELState, error) {
6363
res := sdkresource.NewWithAttributes(
6464
semconv.SchemaURL,
6565
semconv.ServiceName(serviceName),

0 commit comments

Comments
 (0)