diff --git a/.chloggen/zap-default-errorlog.yaml b/.chloggen/zap-default-errorlog.yaml new file mode 100644 index 00000000000..581e0408c0f --- /dev/null +++ b/.chloggen/zap-default-errorlog.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: confighttp + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: "Added Zap as the default error log in confighttp" + +# One or more tracking issues or pull requests related to the change +issues: [11820] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/config/confighttp/confighttp.go b/config/confighttp/confighttp.go index c8ab4544aeb..de74f8b9fe5 100644 --- a/config/confighttp/confighttp.go +++ b/config/confighttp/confighttp.go @@ -20,6 +20,8 @@ import ( "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/metric/noop" + "go.uber.org/zap" + "go.uber.org/zap/zapcore" "golang.org/x/net/http2" "golang.org/x/net/publicsuffix" @@ -478,6 +480,7 @@ func (hss *ServerConfig) ToServer(_ context.Context, host component.Host, settin next: handler, includeMetadata: hss.IncludeMetadata, } + errorLog, err := zap.NewStdLogAt(settings.Logger, zapcore.ErrorLevel) server := &http.Server{ Handler: handler, @@ -485,9 +488,10 @@ func (hss *ServerConfig) ToServer(_ context.Context, host component.Host, settin ReadHeaderTimeout: hss.ReadHeaderTimeout, WriteTimeout: hss.WriteTimeout, IdleTimeout: hss.IdleTimeout, + ErrorLog: errorLog, } - return server, nil + return server, err } func responseHeadersHandler(handler http.Handler, headers map[string]configopaque.String) http.Handler {