From ed0e7c9ae5c77437dc94796d70877d93d4ffe1ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 May 2026 13:23:33 +0000 Subject: [PATCH] build(deps): bump go.mozilla.org/mozlogrus Bumps [go.mozilla.org/mozlogrus](https://github.com/mozilla-services/go-mozlogrus) from 1.0.0 to 2.0.0+incompatible. - [Release notes](https://github.com/mozilla-services/go-mozlogrus/releases) - [Commits](https://github.com/mozilla-services/go-mozlogrus/compare/v1.0.0...v2.0.0) --- updated-dependencies: - dependency-name: go.mozilla.org/mozlogrus dependency-version: 2.0.0+incompatible dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- go.mod | 3 +- go.sum | 6 +- vendor/go.mozilla.org/mozlog/.gitignore | 24 -- vendor/go.mozilla.org/mozlog/.travis.yml | 14 - vendor/go.mozilla.org/mozlog/LICENSE | 362 ---------------------- vendor/go.mozilla.org/mozlog/README.md | 11 - vendor/go.mozilla.org/mozlog/mozlog.go | 89 ------ vendor/go.mozilla.org/mozlogrus/README.md | 19 +- vendor/go.mozilla.org/mozlogrus/applog.go | 25 ++ vendor/go.mozilla.org/mozlogrus/logrus.go | 88 ++++-- vendor/modules.txt | 5 +- 11 files changed, 106 insertions(+), 540 deletions(-) delete mode 100644 vendor/go.mozilla.org/mozlog/.gitignore delete mode 100644 vendor/go.mozilla.org/mozlog/.travis.yml delete mode 100644 vendor/go.mozilla.org/mozlog/LICENSE delete mode 100644 vendor/go.mozilla.org/mozlog/README.md delete mode 100644 vendor/go.mozilla.org/mozlog/mozlog.go create mode 100644 vendor/go.mozilla.org/mozlogrus/applog.go diff --git a/go.mod b/go.mod index 70a97cc3..18663fb5 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.4 github.com/vimeo/go-util v1.4.1 - go.mozilla.org/mozlogrus v1.0.0 + go.mozilla.org/mozlogrus v2.0.0+incompatible golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 howett.net/plist v1.0.1 ) @@ -44,7 +44,6 @@ require ( github.com/oremj/gostatsd v0.0.0-20190107234615-91b6458719ae // indirect github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect - go.mozilla.org/mozlog v0.0.0-20170222151521-4bb13139d403 // indirect go.opentelemetry.io/auto/sdk v1.2.1 // indirect go.opentelemetry.io/contrib/detectors/gcp v1.39.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect diff --git a/go.sum b/go.sum index f691e968..22981718 100644 --- a/go.sum +++ b/go.sum @@ -98,10 +98,8 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/vimeo/go-util v1.4.1 h1:UbNoaYH1eHv4LqBSH6zIItj+zKqbln0i01oY3iA/QPM= github.com/vimeo/go-util v1.4.1/go.mod h1:r+yspV//C48HeMXV8nEvtUeNiIiGfVv3bbEHzOgudwE= -go.mozilla.org/mozlog v0.0.0-20170222151521-4bb13139d403 h1:rKyWXYDfrVOpMFBion4Pmx5sJbQreQNXycHvm4KwJSg= -go.mozilla.org/mozlog v0.0.0-20170222151521-4bb13139d403/go.mod h1:jHoPAGnDrCy6kaI2tAze5Prf0Nr0w/oNkROt2lw3n3o= -go.mozilla.org/mozlogrus v1.0.0 h1:8FWASFDozt1q1B+j6EoSBt62YN4k7nMWFLb3VyawXzA= -go.mozilla.org/mozlogrus v1.0.0/go.mod h1:bg4v22liQ+tLlQ6nI56e5C7Xe8AqEU4xDdEpWoCzQ6M= +go.mozilla.org/mozlogrus v2.0.0+incompatible h1:V8aAmJPN07RQuTJZfsroehGglIERIpbj/C5ClwE6fao= +go.mozilla.org/mozlogrus v2.0.0+incompatible/go.mod h1:bg4v22liQ+tLlQ6nI56e5C7Xe8AqEU4xDdEpWoCzQ6M= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= go.opentelemetry.io/contrib/detectors/gcp v1.39.0 h1:kWRNZMsfBHZ+uHjiH4y7Etn2FK26LAGkNFw7RHv1DhE= diff --git a/vendor/go.mozilla.org/mozlog/.gitignore b/vendor/go.mozilla.org/mozlog/.gitignore deleted file mode 100644 index daf913b1..00000000 --- a/vendor/go.mozilla.org/mozlog/.gitignore +++ /dev/null @@ -1,24 +0,0 @@ -# Compiled Object files, Static and Dynamic libs (Shared Objects) -*.o -*.a -*.so - -# Folders -_obj -_test - -# Architecture specific extensions/prefixes -*.[568vq] -[568vq].out - -*.cgo1.go -*.cgo2.c -_cgo_defun.c -_cgo_gotypes.go -_cgo_export.* - -_testmain.go - -*.exe -*.test -*.prof diff --git a/vendor/go.mozilla.org/mozlog/.travis.yml b/vendor/go.mozilla.org/mozlog/.travis.yml deleted file mode 100644 index 00d0a374..00000000 --- a/vendor/go.mozilla.org/mozlog/.travis.yml +++ /dev/null @@ -1,14 +0,0 @@ -language: go - -go: - - 1.5 - - 1.6 - - tip - -go_import_path: go.mozilla.org/mozlog - -install: true - -before_install: - - go get github.com/Sirupsen/logrus - - go get github.com/stretchr/testify/assert diff --git a/vendor/go.mozilla.org/mozlog/LICENSE b/vendor/go.mozilla.org/mozlog/LICENSE deleted file mode 100644 index be2cc4df..00000000 --- a/vendor/go.mozilla.org/mozlog/LICENSE +++ /dev/null @@ -1,362 +0,0 @@ -Mozilla Public License, version 2.0 - -1. Definitions - -1.1. "Contributor" - - means each individual or legal entity that creates, contributes to the - creation of, or owns Covered Software. - -1.2. "Contributor Version" - - means the combination of the Contributions of others (if any) used by a - Contributor and that particular Contributor's Contribution. - -1.3. "Contribution" - - means Covered Software of a particular Contributor. - -1.4. "Covered Software" - - means Source Code Form to which the initial Contributor has attached the - notice in Exhibit A, the Executable Form of such Source Code Form, and - Modifications of such Source Code Form, in each case including portions - thereof. - -1.5. "Incompatible With Secondary Licenses" - means - - a. that the initial Contributor has attached the notice described in - Exhibit B to the Covered Software; or - - b. that the Covered Software was made available under the terms of - version 1.1 or earlier of the License, but not also under the terms of - a Secondary License. - -1.6. "Executable Form" - - means any form of the work other than Source Code Form. - -1.7. "Larger Work" - - means a work that combines Covered Software with other material, in a - separate file or files, that is not Covered Software. - -1.8. "License" - - means this document. - -1.9. "Licensable" - - means having the right to grant, to the maximum extent possible, whether - at the time of the initial grant or subsequently, any and all of the - rights conveyed by this License. - -1.10. "Modifications" - - means any of the following: - - a. any file in Source Code Form that results from an addition to, - deletion from, or modification of the contents of Covered Software; or - - b. any new file in Source Code Form that contains any Covered Software. - -1.11. "Patent Claims" of a Contributor - - means any patent claim(s), including without limitation, method, - process, and apparatus claims, in any patent Licensable by such - Contributor that would be infringed, but for the grant of the License, - by the making, using, selling, offering for sale, having made, import, - or transfer of either its Contributions or its Contributor Version. - -1.12. "Secondary License" - - means either the GNU General Public License, Version 2.0, the GNU Lesser - General Public License, Version 2.1, the GNU Affero General Public - License, Version 3.0, or any later versions of those licenses. - -1.13. "Source Code Form" - - means the form of the work preferred for making modifications. - -1.14. "You" (or "Your") - - means an individual or a legal entity exercising rights under this - License. For legal entities, "You" includes any entity that controls, is - controlled by, or is under common control with You. For purposes of this - definition, "control" means (a) the power, direct or indirect, to cause - the direction or management of such entity, whether by contract or - otherwise, or (b) ownership of more than fifty percent (50%) of the - outstanding shares or beneficial ownership of such entity. - - -2. License Grants and Conditions - -2.1. Grants - - Each Contributor hereby grants You a world-wide, royalty-free, - non-exclusive license: - - a. under intellectual property rights (other than patent or trademark) - Licensable by such Contributor to use, reproduce, make available, - modify, display, perform, distribute, and otherwise exploit its - Contributions, either on an unmodified basis, with Modifications, or - as part of a Larger Work; and - - b. under Patent Claims of such Contributor to make, use, sell, offer for - sale, have made, import, and otherwise transfer either its - Contributions or its Contributor Version. - -2.2. Effective Date - - The licenses granted in Section 2.1 with respect to any Contribution - become effective for each Contribution on the date the Contributor first - distributes such Contribution. - -2.3. Limitations on Grant Scope - - The licenses granted in this Section 2 are the only rights granted under - this License. No additional rights or licenses will be implied from the - distribution or licensing of Covered Software under this License. - Notwithstanding Section 2.1(b) above, no patent license is granted by a - Contributor: - - a. for any code that a Contributor has removed from Covered Software; or - - b. for infringements caused by: (i) Your and any other third party's - modifications of Covered Software, or (ii) the combination of its - Contributions with other software (except as part of its Contributor - Version); or - - c. under Patent Claims infringed by Covered Software in the absence of - its Contributions. - - This License does not grant any rights in the trademarks, service marks, - or logos of any Contributor (except as may be necessary to comply with - the notice requirements in Section 3.4). - -2.4. Subsequent Licenses - - No Contributor makes additional grants as a result of Your choice to - distribute the Covered Software under a subsequent version of this - License (see Section 10.2) or under the terms of a Secondary License (if - permitted under the terms of Section 3.3). - -2.5. Representation - - Each Contributor represents that the Contributor believes its - Contributions are its original creation(s) or it has sufficient rights to - grant the rights to its Contributions conveyed by this License. - -2.6. Fair Use - - This License is not intended to limit any rights You have under - applicable copyright doctrines of fair use, fair dealing, or other - equivalents. - -2.7. Conditions - - Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in - Section 2.1. - - -3. Responsibilities - -3.1. Distribution of Source Form - - All distribution of Covered Software in Source Code Form, including any - Modifications that You create or to which You contribute, must be under - the terms of this License. You must inform recipients that the Source - Code Form of the Covered Software is governed by the terms of this - License, and how they can obtain a copy of this License. You may not - attempt to alter or restrict the recipients' rights in the Source Code - Form. - -3.2. Distribution of Executable Form - - If You distribute Covered Software in Executable Form then: - - a. such Covered Software must also be made available in Source Code Form, - as described in Section 3.1, and You must inform recipients of the - Executable Form how they can obtain a copy of such Source Code Form by - reasonable means in a timely manner, at a charge no more than the cost - of distribution to the recipient; and - - b. You may distribute such Executable Form under the terms of this - License, or sublicense it under different terms, provided that the - license for the Executable Form does not attempt to limit or alter the - recipients' rights in the Source Code Form under this License. - -3.3. Distribution of a Larger Work - - You may create and distribute a Larger Work under terms of Your choice, - provided that You also comply with the requirements of this License for - the Covered Software. If the Larger Work is a combination of Covered - Software with a work governed by one or more Secondary Licenses, and the - Covered Software is not Incompatible With Secondary Licenses, this - License permits You to additionally distribute such Covered Software - under the terms of such Secondary License(s), so that the recipient of - the Larger Work may, at their option, further distribute the Covered - Software under the terms of either this License or such Secondary - License(s). - -3.4. Notices - - You may not remove or alter the substance of any license notices - (including copyright notices, patent notices, disclaimers of warranty, or - limitations of liability) contained within the Source Code Form of the - Covered Software, except that You may alter any license notices to the - extent required to remedy known factual inaccuracies. - -3.5. Application of Additional Terms - - You may choose to offer, and to charge a fee for, warranty, support, - indemnity or liability obligations to one or more recipients of Covered - Software. However, You may do so only on Your own behalf, and not on - behalf of any Contributor. You must make it absolutely clear that any - such warranty, support, indemnity, or liability obligation is offered by - You alone, and You hereby agree to indemnify every Contributor for any - liability incurred by such Contributor as a result of warranty, support, - indemnity or liability terms You offer. You may include additional - disclaimers of warranty and limitations of liability specific to any - jurisdiction. - -4. Inability to Comply Due to Statute or Regulation - - If it is impossible for You to comply with any of the terms of this License - with respect to some or all of the Covered Software due to statute, - judicial order, or regulation then You must: (a) comply with the terms of - this License to the maximum extent possible; and (b) describe the - limitations and the code they affect. Such description must be placed in a - text file included with all distributions of the Covered Software under - this License. Except to the extent prohibited by statute or regulation, - such description must be sufficiently detailed for a recipient of ordinary - skill to be able to understand it. - -5. Termination - -5.1. The rights granted under this License will terminate automatically if You - fail to comply with any of its terms. However, if You become compliant, - then the rights granted under this License from a particular Contributor - are reinstated (a) provisionally, unless and until such Contributor - explicitly and finally terminates Your grants, and (b) on an ongoing - basis, if such Contributor fails to notify You of the non-compliance by - some reasonable means prior to 60 days after You have come back into - compliance. Moreover, Your grants from a particular Contributor are - reinstated on an ongoing basis if such Contributor notifies You of the - non-compliance by some reasonable means, this is the first time You have - received notice of non-compliance with this License from such - Contributor, and You become compliant prior to 30 days after Your receipt - of the notice. - -5.2. If You initiate litigation against any entity by asserting a patent - infringement claim (excluding declaratory judgment actions, - counter-claims, and cross-claims) alleging that a Contributor Version - directly or indirectly infringes any patent, then the rights granted to - You by any and all Contributors for the Covered Software under Section - 2.1 of this License shall terminate. - -5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user - license agreements (excluding distributors and resellers) which have been - validly granted by You or Your distributors under this License prior to - termination shall survive termination. - -6. Disclaimer of Warranty - - Covered Software is provided under this License on an "as is" basis, - without warranty of any kind, either expressed, implied, or statutory, - including, without limitation, warranties that the Covered Software is free - of defects, merchantable, fit for a particular purpose or non-infringing. - The entire risk as to the quality and performance of the Covered Software - is with You. Should any Covered Software prove defective in any respect, - You (not any Contributor) assume the cost of any necessary servicing, - repair, or correction. This disclaimer of warranty constitutes an essential - part of this License. No use of any Covered Software is authorized under - this License except under this disclaimer. - -7. Limitation of Liability - - Under no circumstances and under no legal theory, whether tort (including - negligence), contract, or otherwise, shall any Contributor, or anyone who - distributes Covered Software as permitted above, be liable to You for any - direct, indirect, special, incidental, or consequential damages of any - character including, without limitation, damages for lost profits, loss of - goodwill, work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses, even if such party shall have been - informed of the possibility of such damages. This limitation of liability - shall not apply to liability for death or personal injury resulting from - such party's negligence to the extent applicable law prohibits such - limitation. Some jurisdictions do not allow the exclusion or limitation of - incidental or consequential damages, so this exclusion and limitation may - not apply to You. - -8. Litigation - - Any litigation relating to this License may be brought only in the courts - of a jurisdiction where the defendant maintains its principal place of - business and such litigation shall be governed by laws of that - jurisdiction, without reference to its conflict-of-law provisions. Nothing - in this Section shall prevent a party's ability to bring cross-claims or - counter-claims. - -9. Miscellaneous - - This License represents the complete agreement concerning the subject - matter hereof. If any provision of this License is held to be - unenforceable, such provision shall be reformed only to the extent - necessary to make it enforceable. Any law or regulation which provides that - the language of a contract shall be construed against the drafter shall not - be used to construe this License against a Contributor. - - -10. Versions of the License - -10.1. New Versions - - Mozilla Foundation is the license steward. Except as provided in Section - 10.3, no one other than the license steward has the right to modify or - publish new versions of this License. Each version will be given a - distinguishing version number. - -10.2. Effect of New Versions - - You may distribute the Covered Software under the terms of the version - of the License under which You originally received the Covered Software, - or under the terms of any subsequent version published by the license - steward. - -10.3. Modified Versions - - If you create software not governed by this License, and you want to - create a new license for such software, you may create and use a - modified version of this License if you rename the license and remove - any references to the name of the license steward (except to note that - such modified license differs from this License). - -10.4. Distributing Source Code Form that is Incompatible With Secondary - Licenses If You choose to distribute Source Code Form that is - Incompatible With Secondary Licenses under the terms of this version of - the License, the notice described in Exhibit B of this License must be - attached. - -Exhibit A - Source Code Form License Notice - - This Source Code Form is subject to the - terms of the Mozilla Public License, v. - 2.0. If a copy of the MPL was not - distributed with this file, You can - obtain one at - http://mozilla.org/MPL/2.0/. - -If it is not possible or desirable to put the notice in a particular file, -then You may include the notice in a location (such as a LICENSE file in a -relevant directory) where a recipient would be likely to look for such a -notice. - -You may add additional accurate notices of copyright ownership. - -Exhibit B - "Incompatible With Secondary Licenses" Notice - - This Source Code Form is "Incompatible - With Secondary Licenses", as defined by - the Mozilla Public License, v. 2.0. diff --git a/vendor/go.mozilla.org/mozlog/README.md b/vendor/go.mozilla.org/mozlog/README.md deleted file mode 100644 index 8d4b9f96..00000000 --- a/vendor/go.mozilla.org/mozlog/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# mozlog [![GoDoc](https://godoc.org/go.mozilla.org/mozlog?status.svg)](https://godoc.org/go.mozilla.org/mozlog) [![Build Status](https://travis-ci.org/mozilla-services/go-mozlog.svg?branch=master)](https://travis-ci.org/mozilla-services/go-mozlog) -A logging library which conforms to [Mozilla's logging standard](https://wiki.mozilla.org/Firefox/Services/Logging). - -## Example Usage -``` -import "go.mozilla.org/mozlog" - -func init() { - mozlog.Logger.LoggerName = "ApplicationName" -} -``` diff --git a/vendor/go.mozilla.org/mozlog/mozlog.go b/vendor/go.mozilla.org/mozlog/mozlog.go deleted file mode 100644 index 7dc30056..00000000 --- a/vendor/go.mozilla.org/mozlog/mozlog.go +++ /dev/null @@ -1,89 +0,0 @@ -package mozlog // import "go.mozilla.org/mozlog" - -import ( - "bytes" - "encoding/json" - "fmt" - "io" - "log" - "os" - "time" -) - -var Logger = &MozLogger{ - Output: os.Stdout, - LoggerName: "Application", -} - -var hostname string - -func Hostname() string { - return hostname -} - -// MozLogger implements the io.Writer interface -type MozLogger struct { - Output io.Writer - LoggerName string -} - -func init() { - var err error - hostname, err = os.Hostname() - if err != nil { - log.Printf("Can't resolve hostname: %v", err) - } - - log.SetOutput(Logger) - log.SetFlags(log.Lshortfile) -} - -// Write converts the log to AppLog -func (m *MozLogger) Write(l []byte) (int, error) { - log := NewAppLog(m.LoggerName, l) - - out, err := log.ToJSON() - if err != nil { - // Need someway to notify that this happened. - fmt.Fprintln(os.Stderr, err) - return 0, err - } - - _, err = m.Output.Write(append(out, '\n')) - return len(l), err -} - -// AppLog implements Mozilla logging standard -type AppLog struct { - Timestamp int64 - Time string - Type string - Logger string - Hostname string `json:",omitempty"` - EnvVersion string - Pid int `json:",omitempty"` - Severity int `json:",omitempty"` - Fields map[string]interface{} -} - -// NewAppLog returns a loggable struct -func NewAppLog(loggerName string, msg []byte) *AppLog { - now := time.Now().UTC() - return &AppLog{ - Timestamp: now.UnixNano(), - Time: now.Format(time.RFC3339), - Type: "app.log", - Logger: loggerName, - Hostname: hostname, - EnvVersion: "2.0", - Pid: os.Getpid(), - Fields: map[string]interface{}{ - "msg": string(bytes.TrimSpace(msg)), - }, - } -} - -// ToJSON converts a logline to JSON -func (a *AppLog) ToJSON() ([]byte, error) { - return json.Marshal(a) -} diff --git a/vendor/go.mozilla.org/mozlogrus/README.md b/vendor/go.mozilla.org/mozlogrus/README.md index e27a197e..e7a0c930 100644 --- a/vendor/go.mozilla.org/mozlogrus/README.md +++ b/vendor/go.mozilla.org/mozlogrus/README.md @@ -1,7 +1,13 @@ # mozlogrus [![GoDoc](https://godoc.org/go.mozilla.org/mozlogrus?status.svg)](https://godoc.org/go.mozilla.org/mozlogrus) A logging library which conforms to [Mozilla's logging standard](https://wiki.mozilla.org/Firefox/Services/Logging) for [logrus](https://github.com/Sirupsen/logrus). -## Example Usage +## Installation + +`go get go.mozilla.org/mozlogrus` + +## Example + +### Basic Usage ```go package main @@ -40,3 +46,14 @@ $ go run mozlogrus.go | jq } } ``` + +### Custom Log Types + +```go +func init() { + mozlogrus.EnableFormatter(&mozlogrus.MozLogFormatter{ + LoggerName: "ApplicationName", + Type: "udp datagram", + }) +} +``` diff --git a/vendor/go.mozilla.org/mozlogrus/applog.go b/vendor/go.mozilla.org/mozlogrus/applog.go new file mode 100644 index 00000000..336efcef --- /dev/null +++ b/vendor/go.mozilla.org/mozlogrus/applog.go @@ -0,0 +1,25 @@ +package mozlogrus + +import ( + "encoding/json" + + "github.com/sirupsen/logrus" +) + +// appLog implements Mozilla logging standard +type appLog struct { + Timestamp int64 + Time string + Type string + Logger string + Hostname string `json:",omitempty"` + EnvVersion string + Pid int `json:",omitempty"` + Severity int `json:",omitempty"` + Fields logrus.Fields `json:",omitempty"` +} + +// ToJSON converts a logline to JSON +func (a *appLog) ToJSON() ([]byte, error) { + return json.Marshal(a) +} diff --git a/vendor/go.mozilla.org/mozlogrus/logrus.go b/vendor/go.mozilla.org/mozlogrus/logrus.go index 98cf1193..b144a129 100644 --- a/vendor/go.mozilla.org/mozlogrus/logrus.go +++ b/vendor/go.mozilla.org/mozlogrus/logrus.go @@ -6,51 +6,58 @@ import ( "os" "time" - "go.mozilla.org/mozlog" - "github.com/sirupsen/logrus" ) -// Enable enables mozlogrus -func Enable(loggerName string) { - logrus.SetFormatter(&MozLogFormatter{ - LoggerName: loggerName, - }) +var hostname string +var pid int - logrus.SetOutput(os.Stdout) +func init() { + var err error + hostname, err = os.Hostname() + if err != nil { + hostname = "unknown" + } + + pid = os.Getpid() } -// SetFormatterName the LoggerName for the logrus formatter -func SetFormatterName(name string) { - logrus.SetFormatter(&MozLogFormatter{ - LoggerName: name, - }) +// Enable sets stdout with idiotmatic mozlog formatting +func Enable(loggerName string) { + EnableFormatter(&MozLogFormatter{LoggerName: loggerName, Type: "app.log"}) } -// prefixFieldClashes is from logrus package -func prefixFieldClashes(data logrus.Fields) { - _, ok := data["msg"] - if ok { - data["fields.msg"] = data["msg"] - } +// EnableFormatter sets stdout logging with a custom MozLogFormatter +func EnableFormatter(m *MozLogFormatter) { + logrus.SetFormatter(m) + logrus.SetOutput(os.Stdout) } type MozLogFormatter struct { LoggerName string + Type string } func (m *MozLogFormatter) Format(entry *logrus.Entry) ([]byte, error) { - appLog := &mozlog.AppLog{ - Timestamp: entry.Time.UTC().UnixNano(), - Time: entry.Time.UTC().Format(time.RFC3339), - Type: "app.log", + t := entry.Time.UTC() + appLog := &appLog{ + Timestamp: t.UnixNano(), + Time: t.Format(time.RFC3339), + Type: m.Type, Logger: m.LoggerName, - Hostname: mozlog.Hostname(), + Hostname: hostname, EnvVersion: "2.0", - Pid: os.Getpid(), - Severity: int(entry.Level), + Pid: pid, + Severity: toSyslogSeverity(entry.Level), } + // set a default type when it is empty + if appLog.Type == "" { + appLog.Type = "app.log" + } + + // make a copy of entry.Data to prevent side effects + // when altering "msg" and error types data := make(logrus.Fields, len(entry.Data)+1) for k, v := range entry.Data { switch v := v.(type) { @@ -61,14 +68,37 @@ func (m *MozLogFormatter) Format(entry *logrus.Entry) ([]byte, error) { } } - prefixFieldClashes(data) - data["msg"] = entry.Message + // prevent losing "msg" when we overwrite it with entry.Message + if _, ok := data["msg"]; ok { + data["fields.msg"] = data["msg"] + } + data["msg"] = entry.Message appLog.Fields = data serialized, err := json.Marshal(appLog) if err != nil { - return nil, fmt.Errorf("Failed to mashal fields to JSON, %v", err) + return nil, fmt.Errorf("Failed to marshal appLog to JSON, %v", err) } return append(serialized, '\n'), nil } + +// toSyslogSeverity converts logrus log levels to syslog ones +func toSyslogSeverity(l logrus.Level) int { + switch l { + case logrus.PanicLevel: + return 1 + case logrus.FatalLevel: + return 2 + case logrus.ErrorLevel: + return 3 + case logrus.WarnLevel: + return 4 + case logrus.InfoLevel: + return 6 + case logrus.DebugLevel: + return 7 + default: + return 0 + } +} diff --git a/vendor/modules.txt b/vendor/modules.txt index 3224bf36..9d5bfa18 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -231,10 +231,7 @@ github.com/spiffe/go-spiffe/v2/spiffeid # github.com/vimeo/go-util v1.4.1 ## explicit; go 1.13 github.com/vimeo/go-util/crc32combine -# go.mozilla.org/mozlog v0.0.0-20170222151521-4bb13139d403 -## explicit -go.mozilla.org/mozlog -# go.mozilla.org/mozlogrus v1.0.0 +# go.mozilla.org/mozlogrus v2.0.0+incompatible ## explicit go.mozilla.org/mozlogrus # go.opentelemetry.io/auto/sdk v1.2.1