mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge 3a9895a582 into 61aa82865d

Browse source
This commit is contained in:
David Kydd 2025-03-05 11:30:59 -08:00 committed by GitHub
parent 61aa82865d 3a9895a582
commit 2c849c9934
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tracing/tracing.go
View file

@ -73,7 +73,7 @@ func (m *Manager) ApplyConfig(cfg *config.Config) error {
// set, we have to restart the manager to make sure that new TLS // set, we have to restart the manager to make sure that new TLS
// certificates are picked up. // certificates are picked up.
var blankTLSConfig config_util.TLSConfig var blankTLSConfig config_util.TLSConfig
if reflect.DeepEqual(m.config, cfg.TracingConfig) && m.config.TLSConfig == blankTLSConfig { if reflect.DeepEqual(m.config, cfg.TracingConfig) && reflect.DeepEqual(m.config.TLSConfig, blankTLSConfig) {
return nil return nil
} }

1
tracing/tracing_test.go
View file

@ -83,6 +83,7 @@ func TestReinstallingTracerProviderWithTLS(t *testing.T) {
ClientType: config.TracingClientGRPC, ClientType: config.TracingClientGRPC,
TLSConfig: config_util.TLSConfig{ TLSConfig: config_util.TLSConfig{
CAFile: "testdata/ca.cer", CAFile: "testdata/ca.cer",
NextProtos: []string{"h2"},
}, },
}, },
} }