diff --git a/cmd/dockerd/daemon.go b/cmd/dockerd/daemon.go index 05eb073728..b81c4bc9b7 100644 --- a/cmd/dockerd/daemon.go +++ b/cmd/dockerd/daemon.go @@ -380,12 +380,20 @@ func (cli *DaemonCli) start(opts *daemonOptions) (err error) { // TODO: This can be removed after buildkit is updated to use http/protobuf as the default. func setOTLPProtoDefault() { const ( - tracesEnv = "OTEL_EXPORTER_OTLP_TRACES_PROTOCOL" - protoEnv = "OTEL_EXPORTER_OTLP_PROTOCOL" + tracesEnv = "OTEL_EXPORTER_OTLP_TRACES_PROTOCOL" + metricsEnv = "OTEL_EXPORTER_OTLP_METRICS_PROTOCOL" + protoEnv = "OTEL_EXPORTER_OTLP_PROTOCOL" + + defaultProto = "http/protobuf" ) - if os.Getenv(tracesEnv) == "" && os.Getenv(protoEnv) == "" { - os.Setenv(tracesEnv, "http/protobuf") + if os.Getenv(protoEnv) == "" { + if os.Getenv(tracesEnv) == "" { + os.Setenv(tracesEnv, defaultProto) + } + if os.Getenv(metricsEnv) == "" { + os.Setenv(metricsEnv, defaultProto) + } } }