Skip to content

Commit 145ad1b

Browse files
ChrsMarkChrsMark
committed
gofmt
Signed-off-by: ChrsMark <[email protected]>
1 parent 9f4ebcb commit 145ad1b

File tree

3 files changed

+88
-68
lines changed

3 files changed

+88
-68
lines changed

‎receiver/receivercreator/discovery.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ func (builder *k8sHintsBuilder) createReceiverTemplateFromHints(env observer.End
8484

8585
func (builder *k8sHintsBuilder) createScraper(
8686
annotations map[string]string,
87-
env observer.EndpointEnv) (*receiverTemplate, error) {
87+
env observer.EndpointEnv,
88+
) (*receiverTemplate, error) {
8889
var port uint16
8990
var p observer.Port
9091
err := mapstructure.Decode(env, &p)
@@ -127,7 +128,8 @@ func (builder *k8sHintsBuilder) createScraper(
127128
func getScraperConfFromAnnotations(
128129
annotations map[string]string,
129130
defaultEndpoint, scopeSuffix string,
130-
logger *zap.Logger) (userConfigMap, error) {
131+
logger *zap.Logger,
132+
) (userConfigMap, error) {
131133
conf := userConfigMap{}
132134
conf[endpointConfigKey] = defaultEndpoint
133135

@@ -150,9 +152,7 @@ func getScraperConfFromAnnotations(
150152
if err != nil {
151153
logger.Debug("configured endpoint is not valid", zap.Error(err))
152154
return userConfigMap{}, fmt.Errorf("configured endpoint is not valid: %v", zap.Error(err))
153-
154155
}
155-
156156
return conf, nil
157157
}
158158

@@ -190,7 +190,7 @@ func getStringEnv(env observer.EndpointEnv, key string) string {
190190

191191
func validateEndpoint(endpoint, defaultEndpoint string) error {
192192
// replace temporarily the dynamic reference to ease the url parsing
193-
endpoint = strings.Replace(endpoint, "`endpoint`", defaultEndpoint, -1)
193+
endpoint = strings.ReplaceAll(endpoint, "`endpoint`", defaultEndpoint)
194194

195195
uri, _ := url.Parse(endpoint)
196196
// target endpoint can come in form ip:port. In that case we fix the uri

‎receiver/receivercreator/discovery_test.go

Lines changed: 79 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ func TestK8sHintsBuilderMetrics(t *testing.T) {
2222
err := id.UnmarshalText([]byte("redis/pod-2-UID_6379"))
2323
assert.NoError(t, err)
2424

25-
var config = `
25+
config := `
2626
collection_interval: "20s"
2727
timeout: "30s"
2828
username: "username"
2929
password: "changeme"`
30-
var configRedis = `
30+
configRedis := `
3131
collection_interval: "20s"
3232
timeout: "130s"
3333
username: "username"
@@ -53,8 +53,10 @@ password: "changeme"`
5353
otelMetricsHints + "/enabled": "true",
5454
otelMetricsHints + "/scraper": "redis",
5555
otelMetricsHints + "/config": config,
56-
}},
57-
Port: 6379},
56+
},
57+
},
58+
Port: 6379,
59+
},
5860
},
5961
expectedReceiver: receiverTemplate{
6062
receiverConfig: receiverConfig{
@@ -78,8 +80,10 @@ password: "changeme"`
7880
otelMetricsHints + "/enabled": "true",
7981
otelMetricsHints + "/scraper": "redis",
8082
otelMetricsHints + "/config": config,
81-
}},
82-
Port: 6379},
83+
},
84+
},
85+
Port: 6379,
86+
},
8387
},
8488
expectedReceiver: receiverTemplate{},
8589
wantError: false,
@@ -97,8 +101,10 @@ password: "changeme"`
97101
Annotations: map[string]string{
98102
otelMetricsHints + "/enabled": "true",
99103
otelMetricsHints + "/scraper": "redis",
100-
}},
101-
Port: 6379},
104+
},
105+
},
106+
Port: 6379,
107+
},
102108
},
103109
expectedReceiver: receiverTemplate{
104110
receiverConfig: receiverConfig{
@@ -122,8 +128,10 @@ password: "changeme"`
122128
otelMetricsHints + ".6379/enabled": "true",
123129
otelMetricsHints + ".6379/scraper": "redis",
124130
otelMetricsHints + ".6379/config": config,
125-
}},
126-
Port: 6379},
131+
},
132+
},
133+
Port: 6379,
134+
},
127135
},
128136
expectedReceiver: receiverTemplate{
129137
receiverConfig: receiverConfig{
@@ -148,8 +156,10 @@ password: "changeme"`
148156
otelMetricsHints + ".6379/scraper": "redis",
149157
otelMetricsHints + "/config": config,
150158
otelMetricsHints + ".6379/config": configRedis,
151-
}},
152-
Port: 6379},
159+
},
160+
},
161+
Port: 6379,
162+
},
153163
},
154164
expectedReceiver: receiverTemplate{
155165
receiverConfig: receiverConfig{
@@ -173,7 +183,9 @@ password: "changeme"`
173183
otelMetricsHints + "/enabled": "true",
174184
otelMetricsHints + "/scraper": "redis",
175185
otelMetricsHints + "/config": config,
176-
}}},
186+
},
187+
},
188+
},
177189
},
178190
expectedReceiver: receiverTemplate{},
179191
wantError: true,
@@ -204,14 +216,14 @@ password: "changeme"`
204216
}
205217

206218
func TestGetConfFromAnnotations(t *testing.T) {
207-
var config = `
219+
config := `
208220
endpoint: "0.0.0.0:8080"
209221
collection_interval: "20s"
210222
initial_delay: "20s"
211223
read_buffer_size: "10"
212224
nested_example:
213225
foo: bar`
214-
var configNoEndpoint = `
226+
configNoEndpoint := `
215227
collection_interval: "20s"
216228
initial_delay: "20s"
217229
read_buffer_size: "10"
@@ -223,51 +235,52 @@ nested_example:
223235
defaultEndpoint string
224236
scopeSuffix string
225237
expectError bool
226-
}{"simple_annotation_case": {
227-
hintsAnn: map[string]string{
228-
"io.opentelemetry.discovery.metrics/enabled": "true",
229-
"io.opentelemetry.discovery.metrics/config": config,
230-
}, expectedConf: userConfigMap{
231-
"collection_interval": "20s",
232-
"endpoint": "0.0.0.0:8080",
233-
"initial_delay": "20s",
234-
"read_buffer_size": "10",
235-
"nested_example": userConfigMap{"foo": "bar"},
236-
}, defaultEndpoint: "0.0.0.0:8080",
237-
scopeSuffix: "",
238-
}, "simple_annotation_case_default_endpoint": {
239-
hintsAnn: map[string]string{
240-
"io.opentelemetry.discovery.metrics/enabled": "true",
241-
"io.opentelemetry.discovery.metrics/config": configNoEndpoint,
242-
}, expectedConf: userConfigMap{
243-
"collection_interval": "20s",
244-
"endpoint": "1.1.1.1:8080",
245-
"initial_delay": "20s",
246-
"read_buffer_size": "10",
247-
"nested_example": userConfigMap{"foo": "bar"},
248-
}, defaultEndpoint: "1.1.1.1:8080",
249-
scopeSuffix: "",
250-
}, "simple_annotation_case_scoped": {
251-
hintsAnn: map[string]string{
252-
"io.opentelemetry.discovery.metrics.8080/enabled": "true",
253-
"io.opentelemetry.discovery.metrics.8080/config": config,
254-
}, expectedConf: userConfigMap{
255-
"collection_interval": "20s",
256-
"endpoint": "0.0.0.0:8080",
257-
"initial_delay": "20s",
258-
"read_buffer_size": "10",
259-
"nested_example": userConfigMap{"foo": "bar"},
260-
}, defaultEndpoint: "0.0.0.0:8080",
261-
scopeSuffix: "8080",
262-
}, "simple_annotation_case_with_invalid_endpoint": {
263-
hintsAnn: map[string]string{
264-
"io.opentelemetry.discovery.metrics/enabled": "true",
265-
"io.opentelemetry.discovery.metrics/config": config,
266-
}, expectedConf: userConfigMap{},
267-
defaultEndpoint: "1.2.3.4:8080",
268-
scopeSuffix: "",
269-
expectError: true,
270-
},
238+
}{
239+
"simple_annotation_case": {
240+
hintsAnn: map[string]string{
241+
"io.opentelemetry.discovery.metrics/enabled": "true",
242+
"io.opentelemetry.discovery.metrics/config": config,
243+
}, expectedConf: userConfigMap{
244+
"collection_interval": "20s",
245+
"endpoint": "0.0.0.0:8080",
246+
"initial_delay": "20s",
247+
"read_buffer_size": "10",
248+
"nested_example": userConfigMap{"foo": "bar"},
249+
}, defaultEndpoint: "0.0.0.0:8080",
250+
scopeSuffix: "",
251+
}, "simple_annotation_case_default_endpoint": {
252+
hintsAnn: map[string]string{
253+
"io.opentelemetry.discovery.metrics/enabled": "true",
254+
"io.opentelemetry.discovery.metrics/config": configNoEndpoint,
255+
}, expectedConf: userConfigMap{
256+
"collection_interval": "20s",
257+
"endpoint": "1.1.1.1:8080",
258+
"initial_delay": "20s",
259+
"read_buffer_size": "10",
260+
"nested_example": userConfigMap{"foo": "bar"},
261+
}, defaultEndpoint: "1.1.1.1:8080",
262+
scopeSuffix: "",
263+
}, "simple_annotation_case_scoped": {
264+
hintsAnn: map[string]string{
265+
"io.opentelemetry.discovery.metrics.8080/enabled": "true",
266+
"io.opentelemetry.discovery.metrics.8080/config": config,
267+
}, expectedConf: userConfigMap{
268+
"collection_interval": "20s",
269+
"endpoint": "0.0.0.0:8080",
270+
"initial_delay": "20s",
271+
"read_buffer_size": "10",
272+
"nested_example": userConfigMap{"foo": "bar"},
273+
}, defaultEndpoint: "0.0.0.0:8080",
274+
scopeSuffix: "8080",
275+
}, "simple_annotation_case_with_invalid_endpoint": {
276+
hintsAnn: map[string]string{
277+
"io.opentelemetry.discovery.metrics/enabled": "true",
278+
"io.opentelemetry.discovery.metrics/config": config,
279+
}, expectedConf: userConfigMap{},
280+
defaultEndpoint: "1.2.3.4:8080",
281+
scopeSuffix: "",
282+
expectError: true,
283+
},
271284
}
272285

273286
for name, test := range tests {
@@ -287,7 +300,7 @@ nested_example:
287300
}
288301

289302
func TestDiscoveryMetricsEnabled(t *testing.T) {
290-
var config = `
303+
config := `
291304
endpoint: "0.0.0.0:8080"`
292305
tests := map[string]struct {
293306
hintsAnn map[string]string
@@ -346,6 +359,11 @@ func TestValidateEndpoint(t *testing.T) {
346359
defaultEndpoint: "1.2.3.4:8080",
347360
expectError: false,
348361
},
362+
"test_invalid": {
363+
endpoint: "http://0.0.0.0:8080/some?foo=1.2.3.4:8080",
364+
defaultEndpoint: "1.2.3.4:8080",
365+
expectError: true,
366+
},
349367
"test_valid_no_scheme": {
350368
endpoint: "1.2.3.4:8080/stats",
351369
defaultEndpoint: "1.2.3.4:8080",

‎receiver/receivercreator/fixtures_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,10 @@ var portEndpointWithHints = observer.Endpoint{
7272
otelMetricsHints + "/enabled": "true",
7373
otelMetricsHints + "/scraper": "with_endpoint",
7474
otelMetricsHints + "/config": config,
75-
}},
76-
Port: 6379},
75+
},
76+
},
77+
Port: 6379,
78+
},
7779
}
7880

7981
var hostportEndpoint = observer.Endpoint{

0 commit comments

Comments
 (0)