Skip to content

Fix uses of configgrpc/http headers #43680

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix uses of configgrpc/http headers #43680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions exporter/alertmanagerexporter/alertmanager_exporter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,10 +403,10 @@ func TestClientConfig(t *testing.T) {
config: &Config{
ClientConfig: confighttp.ClientConfig{
Endpoint: endpoint,
Headers: map[string]configopaque.String{
Headers: configopaque.MapListFromMap(map[string]configopaque.String{
"hdr1": "val1",
"hdr2": "val2",
},
}),
},
},
},
Expand Down
4 changes: 2 additions & 2 deletions exporter/alertmanagerexporter/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ func TestLoadConfig(t *testing.T) {
}(),
ClientConfig: func() confighttp.ClientConfig {
client := confighttp.NewDefaultClientConfig()
client.Headers = map[string]configopaque.String{
client.Headers = configopaque.MapListFromMap(map[string]configopaque.String{
"can you have a . here?": "F0000000-0000-0000-0000-000000000000",
"header1": "234",
"another": "somevalue",
}
})
client.Endpoint = "a.new.alertmanager.target:9093"
client.TLS = configtls.ClientConfig{
Config: configtls.Config{
Expand Down
12 changes: 6 additions & 6 deletions exporter/coralogixexporter/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
func (c *TransportConfig) ToHTTPClient(ctx context.Context, host component.Host, settings component.TelemetrySettings) (*http.Client, error) {
headers := c.Headers
if headers == nil {
headers = make(map[string]configopaque.String)
headers = configopaque.NewMapList()

Check failure on line 43 in exporter/coralogixexporter/config.go

View workflow job for this annotation

GitHub Actions / govulncheck (exporter-0) 

undefined: configopaque.NewMapList
}
headers["Content-Type"] = "application/x-protobuf"
headers.Set("Content-Type", "application/x-protobuf")

Check failure on line 45 in exporter/coralogixexporter/config.go

View workflow job for this annotation

GitHub Actions / govulncheck (exporter-0) 

headers.Set undefined (type map[string]configopaque.String has no field or method Set)

httpClientConfig := confighttp.ClientConfig{
ProxyURL: c.ProxyURL,
Expand Down Expand Up @@ -226,16 +226,16 @@
if signalConfig.TLS.Insecure || signalConfig.TLS.InsecureSkipVerify || signalConfig.TLS.CAFile != "" {
merged.TLS = signalConfig.TLS
}
if len(signalConfig.Headers) > 0 {
if signalConfig.Headers.Len() > 0 {

Check failure on line 229 in exporter/coralogixexporter/config.go

View workflow job for this annotation

GitHub Actions / govulncheck (exporter-0) 

signalConfig.Headers.Len undefined (type map[string]configopaque.String has no field or method Len)
// Deep-copy domain headers to avoid mutating the shared map
headers := make(map[string]configopaque.String)
for k, v := range merged.Headers {
for k, v := range merged.Headers.Iter {

Check failure on line 232 in exporter/coralogixexporter/config.go

View workflow job for this annotation

GitHub Actions / govulncheck (exporter-0) 

merged.Headers.Iter undefined (type map[string]configopaque.String has no field or method Iter)
headers[k] = v
}
for k, v := range signalConfig.Headers {
for k, v := range signalConfig.Headers.Iter {

Check failure on line 235 in exporter/coralogixexporter/config.go

View workflow job for this annotation

GitHub Actions / govulncheck (exporter-0) 

signalConfig.Headers.Iter undefined (type map[string]configopaque.String has no field or method Iter)
headers[k] = v
}
merged.Headers = headers
merged.Headers = configopaque.MapListFromMap(headers)

Check failure on line 238 in exporter/coralogixexporter/config.go

View workflow job for this annotation

GitHub Actions / govulncheck (exporter-0) 

undefined: configopaque.MapListFromMap
}
if signalConfig.WriteBufferSize > 0 {
merged.WriteBufferSize = signalConfig.WriteBufferSize
Expand Down
4 changes: 2 additions & 2 deletions exporter/coralogixexporter/factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,10 @@ func TestCreateTraces(t *testing.T) {
Traces: TransportConfig{
ClientConfig: configgrpc.ClientConfig{
Endpoint: endpoint,
Headers: map[string]configopaque.String{
Headers: configopaque.MapListFromMap(map[string]configopaque.String{
"hdr1": "val1",
"hdr2": "val2",
},
}),
},
},
},
Expand Down
18 changes: 9 additions & 9 deletions exporter/coralogixexporter/logs_client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func TestLogsExporter_Start(t *testing.T) {
PrivateKey: "test-key",
Logs: TransportConfig{
ClientConfig: configgrpc.ClientConfig{
Headers: map[string]configopaque.String{},
Headers: configopaque.NewMapList(),
},
},
}
Expand All @@ -96,7 +96,7 @@ func TestLogsExporter_Start(t *testing.T) {
require.NoError(t, err)
assert.NotNil(t, exp.clientConn)
assert.NotNil(t, exp.grpcLogsExporter)
assert.Contains(t, exp.config.Logs.Headers, "Authorization")
assert.Contains(t, exp.config.Logs.Headers.ToMap(), "Authorization")

// Test shutdown
err = exp.shutdown(t.Context())
Expand All @@ -109,9 +109,9 @@ func TestLogsExporter_EnhanceContext(t *testing.T) {
PrivateKey: "test-key",
Logs: TransportConfig{
ClientConfig: configgrpc.ClientConfig{
Headers: map[string]configopaque.String{
Headers: configopaque.MapListFromMap(map[string]configopaque.String{
"test-header": "test-value",
},
}),
},
},
}
Expand All @@ -130,7 +130,7 @@ func TestLogsExporter_PushLogs(t *testing.T) {
PrivateKey: "test-key",
Logs: TransportConfig{
ClientConfig: configgrpc.ClientConfig{
Headers: map[string]configopaque.String{},
Headers: configopaque.NewMapList(),
},
},
}
Expand Down Expand Up @@ -178,7 +178,7 @@ func TestLogsExporter_PushLogs_WhenCannotSend(t *testing.T) {
PrivateKey: "test-key",
Logs: TransportConfig{
ClientConfig: configgrpc.ClientConfig{
Headers: map[string]configopaque.String{},
Headers: configopaque.NewMapList(),
},
},
RateLimiter: RateLimiterConfig{
Expand Down Expand Up @@ -280,7 +280,7 @@ func BenchmarkLogsExporter_PushLogs(b *testing.B) {
TLS: configtls.ClientConfig{
Insecure: true,
},
Headers: map[string]configopaque.String{},
Headers: configopaque.NewMapList(),
},
},
PrivateKey: "test-key",
Expand Down Expand Up @@ -335,7 +335,7 @@ func TestLogsExporter_PushLogs_PartialSuccess(t *testing.T) {
TLS: configtls.ClientConfig{
Insecure: true,
},
Headers: map[string]configopaque.String{},
Headers: configopaque.NewMapList(),
},
},
PrivateKey: "test-key",
Expand Down Expand Up @@ -406,7 +406,7 @@ func TestLogsExporter_PushLogs_Performance(t *testing.T) {
TLS: configtls.ClientConfig{
Insecure: true,
},
Headers: map[string]configopaque.String{},
Headers: configopaque.NewMapList(),
},
},
PrivateKey: "test-key",
Expand Down
18 changes: 9 additions & 9 deletions exporter/coralogixexporter/metrics_client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func TestMetricsExporter_Start(t *testing.T) {
PrivateKey: "test-key",
Metrics: TransportConfig{
ClientConfig: configgrpc.ClientConfig{
Headers: map[string]configopaque.String{},
Headers: configopaque.NewMapList(),
},
},
}
Expand All @@ -96,7 +96,7 @@ func TestMetricsExporter_Start(t *testing.T) {
require.NoError(t, err)
assert.NotNil(t, exp.clientConn)
assert.NotNil(t, exp.grpcMetricsExporter)
assert.Contains(t, exp.config.Metrics.Headers, "Authorization")
assert.Contains(t, exp.config.Metrics.Headers.ToMap(), "Authorization")

// Test shutdown
err = exp.shutdown(t.Context())
Expand All @@ -109,9 +109,9 @@ func TestMetricsExporter_EnhanceContext(t *testing.T) {
PrivateKey: "test-key",
Metrics: TransportConfig{
ClientConfig: configgrpc.ClientConfig{
Headers: map[string]configopaque.String{
Headers: configopaque.MapListFromMap(map[string]configopaque.String{
"test-header": "test-value",
},
}),
},
},
}
Expand All @@ -130,7 +130,7 @@ func TestMetricsExporter_PushMetrics(t *testing.T) {
PrivateKey: "test-key",
Metrics: TransportConfig{
ClientConfig: configgrpc.ClientConfig{
Headers: map[string]configopaque.String{},
Headers: configopaque.NewMapList(),
},
},
}
Expand Down Expand Up @@ -190,7 +190,7 @@ func TestMetricsExporter_PushMetrics_WhenCannotSend(t *testing.T) {
PrivateKey: "test-key",
Metrics: TransportConfig{
ClientConfig: configgrpc.ClientConfig{
Headers: map[string]configopaque.String{},
Headers: configopaque.NewMapList(),
},
},
RateLimiter: RateLimiterConfig{
Expand Down Expand Up @@ -293,7 +293,7 @@ func BenchmarkMetricsExporter_PushMetrics(b *testing.B) {
TLS: configtls.ClientConfig{
Insecure: true,
},
Headers: map[string]configopaque.String{},
Headers: configopaque.NewMapList(),
},
},
PrivateKey: "test-key",
Expand Down Expand Up @@ -352,7 +352,7 @@ func TestMetricsExporter_PushMetrics_PartialSuccess(t *testing.T) {
TLS: configtls.ClientConfig{
Insecure: true,
},
Headers: map[string]configopaque.String{},
Headers: configopaque.NewMapList(),
},
},
PrivateKey: "test-key",
Expand Down Expand Up @@ -442,7 +442,7 @@ func TestMetricsExporter_PushMetrics_Performance(t *testing.T) {
TLS: configtls.ClientConfig{
Insecure: true,
},
Headers: map[string]configopaque.String{},
Headers: configopaque.NewMapList(),
},
},
PrivateKey: "test-key",
Expand Down
18 changes: 9 additions & 9 deletions exporter/coralogixexporter/profiles_client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ func TestProfilesExporter_Start(t *testing.T) {
Domain: "test.domain.com",
PrivateKey: "test-key",
Profiles: configgrpc.ClientConfig{
Headers: map[string]configopaque.String{},
Headers: configopaque.NewMapList(),
},
}

Expand All @@ -93,7 +93,7 @@ func TestProfilesExporter_Start(t *testing.T) {
require.NoError(t, err)
assert.NotNil(t, exp.clientConn)
assert.NotNil(t, exp.profilesExporter)
assert.Contains(t, exp.config.Profiles.Headers, "Authorization")
assert.Contains(t, exp.config.Profiles.Headers.ToMap(), "Authorization")

// Test shutdown
err = exp.shutdown(t.Context())
Expand All @@ -105,9 +105,9 @@ func TestProfilesExporter_EnhanceContext(t *testing.T) {
Domain: "test.domain.com",
PrivateKey: "test-key",
Profiles: configgrpc.ClientConfig{
Headers: map[string]configopaque.String{
Headers: configopaque.MapListFromMap(map[string]configopaque.String{
"test-header": "test-value",
},
}),
},
}

Expand All @@ -124,7 +124,7 @@ func TestProfilesExporter_PushProfiles(t *testing.T) {
Domain: "test.domain.com",
PrivateKey: "test-key",
Profiles: configgrpc.ClientConfig{
Headers: map[string]configopaque.String{},
Headers: configopaque.NewMapList(),
},
}

Expand Down Expand Up @@ -172,7 +172,7 @@ func TestProfilesExporter_PushProfiles_WhenCannotSend(t *testing.T) {
Domain: "test.domain.com",
PrivateKey: "test-key",
Profiles: configgrpc.ClientConfig{
Headers: map[string]configopaque.String{},
Headers: configopaque.NewMapList(),
},
RateLimiter: RateLimiterConfig{
Enabled: tt.enabled,
Expand Down Expand Up @@ -279,7 +279,7 @@ func BenchmarkProfilesExporter_PushProfiles(b *testing.B) {
TLS: configtls.ClientConfig{
Insecure: true,
},
Headers: map[string]configopaque.String{},
Headers: configopaque.NewMapList(),
},
PrivateKey: "test-key",
}
Expand Down Expand Up @@ -334,7 +334,7 @@ func TestProfilesExporter_PushProfiles_PartialSuccess(t *testing.T) {
TLS: configtls.ClientConfig{
Insecure: true,
},
Headers: map[string]configopaque.String{},
Headers: configopaque.NewMapList(),
},
PrivateKey: "test-key",
}
Expand Down Expand Up @@ -407,7 +407,7 @@ func TestProfilesExporter_PushProfiles_Performance(t *testing.T) {
TLS: configtls.ClientConfig{
Insecure: true,
},
Headers: map[string]configopaque.String{},
Headers: configopaque.NewMapList(),
},
PrivateKey: "test-key",
RateLimiter: RateLimiterConfig{
Expand Down
10 changes: 5 additions & 5 deletions exporter/coralogixexporter/signals.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
return w.config.Endpoint
}

func newSignalExporter(oCfg *Config, set exp.Settings, signalEndpoint string, headers map[string]configopaque.String) (*signalExporter, error) {
func newSignalExporter(oCfg *Config, set exp.Settings, signalEndpoint string, headers *configopaque.MapList) (*signalExporter, error) {

Check failure on line 54 in exporter/coralogixexporter/signals.go

View workflow job for this annotation

GitHub Actions / govulncheck (exporter-0) 

undefined: configopaque.MapList
if isEmpty(oCfg.Domain) && isEmpty(signalEndpoint) {
return nil, errors.New("coralogix exporter config requires `domain` or `logs.endpoint` configuration")
}
Expand All @@ -60,7 +60,7 @@
set.BuildInfo.Description, set.BuildInfo.Version, runtime.GOOS, runtime.GOARCH)

md := metadata.New(nil)
for k, v := range headers {
for k, v := range headers.Iter {
md.Set(k, string(v))
}

Expand Down Expand Up @@ -121,11 +121,11 @@
func (e *signalExporter) startSignalExporter(ctx context.Context, host component.Host, signalConfig signalConfig) (err error) {
if signalConfigWrapper, ok := signalConfig.(*signalConfigWrapper); ok {
if signalConfigWrapper.config.Headers == nil {
signalConfigWrapper.config.Headers = make(map[string]configopaque.String)
signalConfigWrapper.config.Headers = configopaque.NewMapList()

Check failure on line 124 in exporter/coralogixexporter/signals.go

View workflow job for this annotation

GitHub Actions / govulncheck (exporter-0) 

undefined: configopaque.NewMapList
}
signalConfigWrapper.config.Headers["Authorization"] = configopaque.String("Bearer " + string(e.config.PrivateKey))
signalConfigWrapper.config.Headers.Set("Authorization", configopaque.String("Bearer "+string(e.config.PrivateKey)))

Check failure on line 126 in exporter/coralogixexporter/signals.go

View workflow job for this annotation

GitHub Actions / govulncheck (exporter-0) 

signalConfigWrapper.config.Headers.Set undefined (type map[string]configopaque.String has no field or method Set)
if e.config.Protocol != httpProtocol {
for k, v := range signalConfigWrapper.config.Headers {
for k, v := range signalConfigWrapper.config.Headers.Iter {

Check failure on line 128 in exporter/coralogixexporter/signals.go

View workflow job for this annotation

GitHub Actions / govulncheck (exporter-0) 

signalConfigWrapper.config.Headers.Iter undefined (type map[string]configopaque.String has no field or method Iter)
e.metadata.Set(k, string(v))
}
}
Expand Down
Loading
Loading