Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
- Change `AssertEqual` in `go.opentelemetry.io/otel/log/logtest` to accept `TestingT` in order to support benchmarks and fuzz tests. (#6908)
- Change `SDKProcessorLogQueueCapacity`, `SDKProcessorLogQueueSize`, `SDKProcessorSpanQueueSize`, and `SDKProcessorSpanQueueCapacity` in `go.opentelemetry.io/otel/semconv/v1.36.0/otelconv` to use a `Int64ObservableUpDownCounter`. (#7041)

### Fixed

- Set `config.gRPCCredentials.Value` properly when using TLS/mTLS certificates `go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc`. (#6661)

<!-- Released section -->
<!-- Don't change this section unless doing release -->

Expand Down
4 changes: 4 additions & 0 deletions exporters/otlp/otlplog/otlploggrpc/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ func newGRPCDialOptions(cfg config) []grpc.DialOption {
if cfg.serviceConfig.Value != "" {
dialOpts = append(dialOpts, grpc.WithDefaultServiceConfig(cfg.serviceConfig.Value))
}
// Convert tls config into gRPC credentials if gRPC credentials value is nil.
if cfg.gRPCCredentials.Value == nil && cfg.tlsCfg.Set {
cfg.gRPCCredentials.Value = credentials.NewTLS(cfg.tlsCfg.Value)
}
// Prioritize GRPCCredentials over Insecure (passing both is an error).
if cfg.gRPCCredentials.Value != nil {
dialOpts = append(dialOpts, grpc.WithTransportCredentials(cfg.gRPCCredentials.Value))
Expand Down
Loading