Skip to content

Commit 8c01a8b

Browse files
committed
fix: address comment on TLS
1 parent 2044c89 commit 8c01a8b

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

plugins/otel/metrics.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ func initOTELHTTPExporter(ctx context.Context, config *Config) (metric.Exporter,
3636
// initOTELGRPCExporter creates an OTLP metrics exporter using gRPC transport.
3737
func initOTELGRPCExporter(ctx context.Context, config *Config) (metric.Exporter, error) {
3838
opts := []otlpmetricgrpc.Option{otlpmetricgrpc.WithEndpoint(config.MetricsEndpoint)}
39-
tlsConfig, err := createTLSConfig(config.MetricsTLSCACert, config.MetricsInsecure)
40-
if err != nil {
41-
return nil, err
42-
}
4339
var creds credentials.TransportCredentials
44-
if tlsConfig.InsecureSkipVerify {
40+
if config.MetricsTLSCACert == "" && config.MetricsInsecure {
4541
creds = insecure.NewCredentials()
4642
} else {
43+
tlsConfig, err := createTLSConfig(config.MetricsTLSCACert, config.MetricsInsecure)
44+
if err != nil {
45+
return nil, err
46+
}
4747
creds = credentials.NewTLS(tlsConfig)
4848
}
4949
opts = append(opts, otlpmetricgrpc.WithTLSCredentials(creds))

plugins/otel/traces.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ type OtelClientGRPC struct {
2727

2828
// NewOtelClientGRPC creates a new OpenTelemetry client for gRPC
2929
func NewOtelClientGRPC(endpoint string, headers map[string]string, tlsCACert string, insecureMode bool) (*OtelClientGRPC, error) {
30-
tlsConfig, err := createTLSConfig(tlsCACert, insecureMode)
31-
if err != nil {
32-
return nil, err
33-
}
3430
var creds credentials.TransportCredentials
35-
if tlsConfig.InsecureSkipVerify {
31+
if tlsCACert == "" && insecureMode {
3632
creds = insecure.NewCredentials()
3733
} else {
34+
tlsConfig, err := createTLSConfig(tlsCACert, insecureMode)
35+
if err != nil {
36+
return nil, err
37+
}
3838
creds = credentials.NewTLS(tlsConfig)
3939
}
4040
conn, err := grpc.NewClient(endpoint, grpc.WithTransportCredentials(creds))

0 commit comments

Comments
 (0)