Skip to content

Commit a9936ef

Browse files
authored
fix: set otel insecure flag for all telemetry instantiations (#999)
1 parent 982e4a2 commit a9936ef

File tree

3 files changed

+4
-0
lines changed

3 files changed

+4
-0
lines changed

cmd/hatchet-engine/engine/run.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ func runV0Config(ctx context.Context, sc *server.ServerConfig) ([]Teardown, erro
124124
ServiceName: sc.OpenTelemetry.ServiceName,
125125
CollectorURL: sc.OpenTelemetry.CollectorURL,
126126
TraceIdRatio: sc.OpenTelemetry.TraceIdRatio,
127+
Insecure: sc.OpenTelemetry.Insecure,
127128
})
128129
if err != nil {
129130
return nil, fmt.Errorf("could not initialize tracer: %w", err)
@@ -491,6 +492,7 @@ func runV1Config(ctx context.Context, sc *server.ServerConfig) ([]Teardown, erro
491492
ServiceName: sc.OpenTelemetry.ServiceName,
492493
CollectorURL: sc.OpenTelemetry.CollectorURL,
493494
TraceIdRatio: sc.OpenTelemetry.TraceIdRatio,
495+
Insecure: sc.OpenTelemetry.Insecure,
494496
})
495497
if err != nil {
496498
return nil, fmt.Errorf("could not initialize tracer: %w", err)

pkg/config/server/server.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,7 @@ func BindAllEnv(v *viper.Viper) {
572572
_ = v.BindEnv("otel.serviceName", "SERVER_OTEL_SERVICE_NAME")
573573
_ = v.BindEnv("otel.collectorURL", "SERVER_OTEL_COLLECTOR_URL")
574574
_ = v.BindEnv("otel.traceIdRatio", "SERVER_OTEL_TRACE_ID_RATIO")
575+
_ = v.BindEnv("otel.insecure", "SERVER_OTEL_INSECURE")
575576

576577
// tenant alerting options
577578
_ = v.BindEnv("tenantAlerting.slack.enabled", "SERVER_TENANT_ALERTING_SLACK_ENABLED")

pkg/config/shared/shared.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,5 @@ type OpenTelemetryConfigFile struct {
2323
CollectorURL string `mapstructure:"collectorURL" json:"collectorURL,omitempty"`
2424
ServiceName string `mapstructure:"serviceName" json:"serviceName,omitempty" default:"server"`
2525
TraceIdRatio string `mapstructure:"traceIdRatio" json:"traceIdRatio,omitempty" default:"1"`
26+
Insecure bool `mapstructure:"insecure" json:"insecure,omitempty" default:"false"`
2627
}

0 commit comments

Comments
 (0)