Skip to content

Commit f8ed71d

Browse files
authored
chore: Simplify OtelConfig (#40)
Signed-off-by: Joonas Bergius <joonas@cosmonic.com>
1 parent 1d03a52 commit f8ed71d

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

host.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,13 @@ func (rs RedactedString) Reveal() string {
2121

2222
type OtelConfig struct {
2323
EnableObservability bool `json:"enable_observability"`
24-
EnableTraces *bool `json:"enable_traces,omitempty"`
25-
EnableMetrics *bool `json:"enable_metrics,omitempty"`
26-
EnableLogs *bool `json:"enable_logs,omitempty"`
24+
EnableTraces bool `json:"enable_traces,omitempty"`
25+
EnableMetrics bool `json:"enable_metrics,omitempty"`
26+
EnableLogs bool `json:"enable_logs,omitempty"`
2727
ObservabilityEndpoint string `json:"observability_endpoint,omitempty"`
2828
TracesEndpoint string `json:"traces_endpoint,omitempty"`
2929
MetricsEndpoint string `json:"metrics_endpoint,omitempty"`
3030
LogsEndpoint string `json:"logs_endpoint,omitempty"`
31-
TraceLevel *Level `json:"trace_level,omitempty"`
3231
Protocol string `json:"protocol,omitempty"`
3332
}
3433

provider.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func NewWithHostDataSource(source io.Reader, options ...ProviderHandler) (*Wasmc
125125
return nil, err
126126
}
127127

128-
if hostData.OtelConfig.EnableObservability || (hostData.OtelConfig.EnableMetrics != nil && *hostData.OtelConfig.EnableMetrics) {
128+
if hostData.OtelConfig.EnableObservability || hostData.OtelConfig.EnableMetrics {
129129
meterProvider, err := newMeterProvider(context.Background(), hostData.OtelConfig, serviceResource)
130130
if err != nil {
131131
return nil, err
@@ -134,7 +134,7 @@ func NewWithHostDataSource(source io.Reader, options ...ProviderHandler) (*Wasmc
134134
internalShutdownFuncs = append(internalShutdownFuncs, func(c context.Context) error { return meterProvider.Shutdown(c) })
135135
}
136136

137-
if hostData.OtelConfig.EnableObservability || (hostData.OtelConfig.EnableTraces != nil && *hostData.OtelConfig.EnableTraces) {
137+
if hostData.OtelConfig.EnableObservability || hostData.OtelConfig.EnableTraces {
138138
tracerProvider, err := newTracerProvider(context.Background(), hostData.OtelConfig, serviceResource)
139139
if err != nil {
140140
return nil, err
@@ -143,7 +143,7 @@ func NewWithHostDataSource(source io.Reader, options ...ProviderHandler) (*Wasmc
143143
internalShutdownFuncs = append(internalShutdownFuncs, func(c context.Context) error { return tracerProvider.Shutdown(c) })
144144
}
145145

146-
if hostData.OtelConfig.EnableObservability || (hostData.OtelConfig.EnableLogs != nil && *hostData.OtelConfig.EnableLogs) {
146+
if hostData.OtelConfig.EnableObservability || hostData.OtelConfig.EnableLogs {
147147
loggerProvider, err := newLoggerProvider(context.Background(), hostData.OtelConfig, serviceResource)
148148
if err != nil {
149149
return nil, err

0 commit comments

Comments
 (0)