Skip to content

Commit 6097f95

Browse files
Zhihan-LiZhihan-Li
committed
lint
1 parent 59041d3 commit 6097f95

File tree

2 files changed

+77
-80
lines changed

2 files changed

+77
-80
lines changed

‎exporters/otlp/otlplog/otlploggrpc/config_test.go

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -332,47 +332,47 @@ func TestNewConfig(t *testing.T) {
332332
`invalid OTEL_EXPORTER_OTLP_LOGS_TIMEOUT value 100 seconds: strconv.Atoi: parsing "100 seconds": invalid syntax`,
333333
},
334334
},
335-
{
336-
name: "HeadersWithSpaces",
337-
envars: map[string]string{
338-
"OTEL_EXPORTER_OTLP_HEADERS": " keyWithSpaces =value1",
339-
},
340-
want: config{
341-
headers: newSetting(map[string]string{
342-
"keyWithSpaces": "value1",
343-
}),
344-
endpoint: newSetting(defaultEndpoint),
345-
timeout: newSetting(defaultTimeout),
346-
retryCfg: newSetting(defaultRetryCfg),
347-
},
348-
},
349335
{
350-
name: "HeadersWithPercentEncoding",
351-
envars: map[string]string{
352-
"OTEL_EXPORTER_OTLP_HEADERS": "percent%20encoded=value,normal=ok",
353-
},
354-
want: config{
355-
headers: newSetting(map[string]string{
356-
"percent%20encoded": "value",
357-
"normal": "ok",
358-
}),
359-
endpoint: newSetting(defaultEndpoint),
360-
timeout: newSetting(defaultTimeout),
361-
retryCfg: newSetting(defaultRetryCfg),
362-
},
363-
},
336+
name: "HeadersWithSpaces",
337+
envars: map[string]string{
338+
"OTEL_EXPORTER_OTLP_HEADERS": " keyWithSpaces =value1",
339+
},
340+
want: config{
341+
headers: newSetting(map[string]string{
342+
"keyWithSpaces": "value1",
343+
}),
344+
endpoint: newSetting(defaultEndpoint),
345+
timeout: newSetting(defaultTimeout),
346+
retryCfg: newSetting(defaultRetryCfg),
347+
},
348+
},
364349
{
365-
name: "HeadersWithInvalidKey",
366-
envars: map[string]string{
367-
"OTEL_EXPORTER_OTLP_HEADERS": "valid=ok,inva lid=not_ok,also_valid=fine",
368-
},
369-
want: config{
370-
endpoint: newSetting(defaultEndpoint),
371-
timeout: newSetting(defaultTimeout),
372-
retryCfg: newSetting(defaultRetryCfg),
373-
},
374-
errs: []string{`invalid header key: inva lid`},
375-
},
350+
name: "HeadersWithPercentEncoding",
351+
envars: map[string]string{
352+
"OTEL_EXPORTER_OTLP_HEADERS": "percent%20encoded=value,normal=ok",
353+
},
354+
want: config{
355+
headers: newSetting(map[string]string{
356+
"percent%20encoded": "value",
357+
"normal": "ok",
358+
}),
359+
endpoint: newSetting(defaultEndpoint),
360+
timeout: newSetting(defaultTimeout),
361+
retryCfg: newSetting(defaultRetryCfg),
362+
},
363+
},
364+
{
365+
name: "HeadersWithInvalidKey",
366+
envars: map[string]string{
367+
"OTEL_EXPORTER_OTLP_HEADERS": "valid=ok,inva lid=not_ok,also_valid=fine",
368+
},
369+
want: config{
370+
endpoint: newSetting(defaultEndpoint),
371+
timeout: newSetting(defaultTimeout),
372+
retryCfg: newSetting(defaultRetryCfg),
373+
},
374+
errs: []string{`invalid header key: inva lid`},
375+
},
376376
}
377377

378378
for _, tc := range testcases {

‎exporters/otlp/otlplog/otlploghttp/config_test.go

Lines changed: 38 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -338,49 +338,46 @@ func TestNewConfig(t *testing.T) {
338338
},
339339
},
340340
{
341-
name: "HeadersWithSpaces",
342-
envars: map[string]string{
343-
"OTEL_EXPORTER_OTLP_HEADERS": " keyWithSpaces =value1",
344-
},
345-
want: config{
346-
headers: newSetting(map[string]string{
347-
"keyWithSpaces": "value1",
348-
}),
349-
endpoint: newSetting(defaultEndpoint),
350-
path: newSetting(defaultPath),
351-
timeout: newSetting(defaultTimeout),
352-
retryCfg: newSetting(defaultRetryCfg),
353-
},
354-
},
341+
name: "HeadersWithSpaces",
342+
envars: map[string]string{
343+
"OTEL_EXPORTER_OTLP_HEADERS": " keyWithSpaces =value1",
344+
},
345+
want: config{
346+
headers: newSetting(map[string]string{
347+
"keyWithSpaces": "value1",
348+
}),
349+
endpoint: newSetting(defaultEndpoint),
350+
timeout: newSetting(defaultTimeout),
351+
retryCfg: newSetting(defaultRetryCfg),
352+
},
353+
},
355354
{
356-
name: "HeadersWithPercentEncoding",
357-
envars: map[string]string{
358-
"OTEL_EXPORTER_OTLP_HEADERS": "percent%20encoded=value,normal=ok",
359-
},
360-
want: config{
361-
headers: newSetting(map[string]string{
362-
"percent%20encoded": "value",
363-
"normal": "ok",
364-
}),
365-
endpoint: newSetting(defaultEndpoint),
366-
path: newSetting(defaultPath),
367-
timeout: newSetting(defaultTimeout),
368-
retryCfg: newSetting(defaultRetryCfg),
369-
},
370-
},
355+
name: "HeadersWithPercentEncoding",
356+
envars: map[string]string{
357+
"OTEL_EXPORTER_OTLP_HEADERS": "percent%20encoded=value,normal=ok",
358+
},
359+
want: config{
360+
headers: newSetting(map[string]string{
361+
"percent%20encoded": "value",
362+
"normal": "ok",
363+
}),
364+
endpoint: newSetting(defaultEndpoint),
365+
timeout: newSetting(defaultTimeout),
366+
retryCfg: newSetting(defaultRetryCfg),
367+
},
368+
},
371369
{
372-
name: "HeadersWithInvalidKey",
373-
envars: map[string]string{
374-
"OTEL_EXPORTER_OTLP_HEADERS": "valid=ok,inva lid=not_ok,also_valid=fine",
375-
},
376-
want: config{
377-
endpoint: newSetting(defaultEndpoint),
378-
path: newSetting(defaultPath),
379-
timeout: newSetting(defaultTimeout),
380-
retryCfg: newSetting(defaultRetryCfg),
381-
},
382-
errs: []string{`invalid header key: inva lid`},
383-
},
370+
name: "HeadersWithInvalidKey",
371+
envars: map[string]string{
372+
"OTEL_EXPORTER_OTLP_HEADERS": "valid=ok,inva lid=not_ok,also_valid=fine",
373+
},
374+
want: config{
375+
endpoint: newSetting(defaultEndpoint),
376+
timeout: newSetting(defaultTimeout),
377+
retryCfg: newSetting(defaultRetryCfg),
378+
},
379+
errs: []string{`invalid header key: inva lid`},
380+
},
384381
}
385382

386383
for _, tc := range testcases {

0 commit comments

Comments
 (0)