From 9da47f9859850b4f4db318e6d6e91b14be5796bd Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Wed, 27 Nov 2024 10:33:45 -0800 Subject: [PATCH] more tidying Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- CHANGELOG.md | 2 +- config/log.go | 3 ++- config/trace.go | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73a84a2b4fe..69c17f9c461 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - Added support for providing `endpoint`, `pollingIntervalMs` and `initialSamplingRate` using environment variable `OTEL_TRACES_SAMPLER_ARG` in `go.opentelemetry.io/contrib/samples/jaegerremote`. (#6310) - Added support exporting logs via OTLP over gRPC in `go.opentelemetry.io/contrib/config`. (#6340) -- Added support for configuring certificates when exporting OTLP over gRPC in `go.opentelemetry.io/contrib/config`. (#6376) +- Added support for configuring `Certificate` field when exporting OTLP over gRPC in `go.opentelemetry.io/contrib/config`. (#6376) ### Changed diff --git a/config/log.go b/config/log.go index abc60e83645..df460ea53d6 100644 --- a/config/log.go +++ b/config/log.go @@ -10,6 +10,8 @@ import ( "net/url" "time" + "google.golang.org/grpc/credentials" + "go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc" "go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp" "go.opentelemetry.io/otel/exporters/stdout/stdoutlog" @@ -17,7 +19,6 @@ import ( "go.opentelemetry.io/otel/log/noop" sdklog "go.opentelemetry.io/otel/sdk/log" "go.opentelemetry.io/otel/sdk/resource" - "google.golang.org/grpc/credentials" ) func loggerProvider(cfg configOptions, res *resource.Resource) (log.LoggerProvider, shutdownFunc, error) { diff --git a/config/trace.go b/config/trace.go index 38e77f0dc5e..21ea912f42b 100644 --- a/config/trace.go +++ b/config/trace.go @@ -10,6 +10,8 @@ import ( "net/url" "time" + "google.golang.org/grpc/credentials" + "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp" "go.opentelemetry.io/otel/exporters/stdout/stdouttrace" @@ -17,7 +19,6 @@ import ( sdktrace "go.opentelemetry.io/otel/sdk/trace" "go.opentelemetry.io/otel/trace" "go.opentelemetry.io/otel/trace/noop" - "google.golang.org/grpc/credentials" ) func tracerProvider(cfg configOptions, res *resource.Resource) (trace.TracerProvider, shutdownFunc, error) {