H0llyW00dzZ/prometheus
H0llyW00dzZ/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-02-06 10:24:02 +00:00
Code Releases Wiki Activity

Merge 3a9895a5825f3a98212999b1b04b861cae42cb89 into cb096a8ea894af06aff1c4846857800a1cea9b8d

Browse Source
This commit is contained in:
David Kydd 2025-02-05 22:49:52 -08:00 committed by GitHub
commit 12c350bad3
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
// certificates are picked up.
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
}

3
tracing/tracing_test.go
View File

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