Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(headers): also populate headers from specified environment variables #99

Merged
merged 5 commits into from
Feb 6, 2024
Merged

fix(headers): also populate headers from specified environment variables #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
82e15df
fix(headers): empty headers override environment variables
smoyer64 Dec 22, 2023
4de225b
fix(headers): add header options to Configuration Options
smoyer64 Dec 28, 2023
3efb3c5
fix(headers): set empty maps when environment variables are not present
smoyer64 Dec 29, 2023
4316f5d
refactor(headers): a better way to make sure the header maps are init…
smoyer64 Dec 29, 2023
7a5d30d
refactor(headers): restore Config initialization order
smoyer64 Dec 29, 2023
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
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ As of v1.8.0, this package has been renamed from `otel-launcher-go` to `otel-con
| WithServiceName | OTEL_SERVICE_NAME | y | - |
| WithServiceVersion | OTEL_SERVICE_VERSION | n | - |
| WithHeaders | OTEL_EXPORTER_OTLP_HEADERS | n | {} |
| WithTracesHeaders | OTEL_EXPORTER_OTLP_TRACES_HEADERS | n | {} |
| WithMetricsHeaders | OTEL_EXPORTER_OTLP_METRICS_HEADERS | n | {} |
| WithExporterProtocol | OTEL_EXPORTER_OTLP_PROTOCOL | n | grpc |
| WithTracesExporterEndpoint | OTEL_EXPORTER_OTLP_TRACES_ENDPOINT | n | localhost:4317 |
| WithTracesExporterInsecure | OTEL_EXPORTER_OTLP_TRACES_INSECURE | n | false |
Expand Down
40 changes: 20 additions & 20 deletions otelconfig/otelconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,26 +301,26 @@ func (l *defaultHandler) Handle(err error) {
// vary depending on the protocol chosen. If not overridden by explicit configuration, it will
// be overridden with an appropriate default upon initialization.
type Config struct {
ExporterEndpoint string `env:"OTEL_EXPORTER_OTLP_ENDPOINT"`
ExporterEndpointInsecure bool `env:"OTEL_EXPORTER_OTLP_INSECURE,default=false"`
TracesExporterEndpoint string `env:"OTEL_EXPORTER_OTLP_TRACES_ENDPOINT"`
TracesExporterEndpointInsecure bool `env:"OTEL_EXPORTER_OTLP_TRACES_INSECURE"`
TracesEnabled bool `env:"OTEL_TRACES_ENABLED,default=true"`
ServiceName string `env:"OTEL_SERVICE_NAME"`
ServiceVersion string `env:"OTEL_SERVICE_VERSION,default=unknown"`
MetricsExporterEndpoint string `env:"OTEL_EXPORTER_OTLP_METRICS_ENDPOINT"`
MetricsExporterEndpointInsecure bool `env:"OTEL_EXPORTER_OTLP_METRICS_INSECURE"`
MetricsEnabled bool `env:"OTEL_METRICS_ENABLED,default=true"`
MetricsReportingPeriod string `env:"OTEL_EXPORTER_OTLP_METRICS_PERIOD,default=30s"`
LogLevel string `env:"OTEL_LOG_LEVEL,default=info"`
Propagators []string `env:"OTEL_PROPAGATORS,default=tracecontext,baggage"`
ResourceAttributesFromEnv string `env:"OTEL_RESOURCE_ATTRIBUTES"`
ExporterProtocol Protocol `env:"OTEL_EXPORTER_OTLP_PROTOCOL,default=grpc"`
TracesExporterProtocol Protocol `env:"OTEL_EXPORTER_OTLP_TRACES_PROTOCOL"`
MetricsExporterProtocol Protocol `env:"OTEL_EXPORTER_OTLP_METRICS_PROTOCOL"`
Headers map[string]string
TracesHeaders map[string]string
MetricsHeaders map[string]string
ExporterEndpoint string `env:"OTEL_EXPORTER_OTLP_ENDPOINT"`
ExporterEndpointInsecure bool `env:"OTEL_EXPORTER_OTLP_INSECURE,default=false"`
TracesExporterEndpoint string `env:"OTEL_EXPORTER_OTLP_TRACES_ENDPOINT"`
TracesExporterEndpointInsecure bool `env:"OTEL_EXPORTER_OTLP_TRACES_INSECURE"`
TracesEnabled bool `env:"OTEL_TRACES_ENABLED,default=true"`
ServiceName string `env:"OTEL_SERVICE_NAME"`
ServiceVersion string `env:"OTEL_SERVICE_VERSION,default=unknown"`
MetricsExporterEndpoint string `env:"OTEL_EXPORTER_OTLP_METRICS_ENDPOINT"`
MetricsExporterEndpointInsecure bool `env:"OTEL_EXPORTER_OTLP_METRICS_INSECURE"`
MetricsEnabled bool `env:"OTEL_METRICS_ENABLED,default=true"`
MetricsReportingPeriod string `env:"OTEL_EXPORTER_OTLP_METRICS_PERIOD,default=30s"`
LogLevel string `env:"OTEL_LOG_LEVEL,default=info"`
Propagators []string `env:"OTEL_PROPAGATORS,default=tracecontext,baggage"`
ResourceAttributesFromEnv string `env:"OTEL_RESOURCE_ATTRIBUTES"`
ExporterProtocol Protocol `env:"OTEL_EXPORTER_OTLP_PROTOCOL,default=grpc"`
TracesExporterProtocol Protocol `env:"OTEL_EXPORTER_OTLP_TRACES_PROTOCOL"`
MetricsExporterProtocol Protocol `env:"OTEL_EXPORTER_OTLP_METRICS_PROTOCOL"`
Headers map[string]string `env:"OTEL_EXPORTER_OTLP_HEADERS,overwrite,separator=="`
TracesHeaders map[string]string `env:"OTEL_EXPORTER_OTLP_TRACES_HEADERS,overwrite,separator=="`
MetricsHeaders map[string]string `env:"OTEL_EXPORTER_OTLP_METRICS_HEADERS,overwrite,separator=="`
ResourceAttributes map[string]string
SpanProcessors []trace.SpanProcessor
Sampler trace.Sampler
Expand Down
Loading