cmd/prometheus: replace glog by glog-gokit (#4931)
Signed-off-by: Simon Pasquier <spasquie@redhat.com>pull/4953/head
Simon Pasquier
7 years ago
committed by
GitHub
parent
11a52be1d8
commit
ac9d5f3d53
@ -1,191 +1,21 @@ |
|||||||
Apache License |
MIT License |
||||||
Version 2.0, January 2004 |
|
||||||
http://www.apache.org/licenses/ |
Copyright (c) 2018 Kubermatic |
||||||
|
|
||||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION |
Permission is hereby granted, free of charge, to any person obtaining a copy |
||||||
|
of this software and associated documentation files (the "Software"), to deal |
||||||
1. Definitions. |
in the Software without restriction, including without limitation the rights |
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
||||||
"License" shall mean the terms and conditions for use, reproduction, and |
copies of the Software, and to permit persons to whom the Software is |
||||||
distribution as defined by Sections 1 through 9 of this document. |
furnished to do so, subject to the following conditions: |
||||||
|
|
||||||
"Licensor" shall mean the copyright owner or entity authorized by the copyright |
The above copyright notice and this permission notice shall be included in all |
||||||
owner that is granting the License. |
copies or substantial portions of the Software. |
||||||
|
|
||||||
"Legal Entity" shall mean the union of the acting entity and all other entities |
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
||||||
that control, are controlled by, or are under common control with that entity. |
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
||||||
For the purposes of this definition, "control" means (i) the power, direct or |
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
||||||
indirect, to cause the direction or management of such entity, whether by |
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
||||||
contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the |
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
||||||
outstanding shares, or (iii) beneficial ownership of such entity. |
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
||||||
|
SOFTWARE. |
||||||
"You" (or "Your") shall mean an individual or Legal Entity exercising |
|
||||||
permissions granted by this License. |
|
||||||
|
|
||||||
"Source" form shall mean the preferred form for making modifications, including |
|
||||||
but not limited to software source code, documentation source, and configuration |
|
||||||
files. |
|
||||||
|
|
||||||
"Object" form shall mean any form resulting from mechanical transformation or |
|
||||||
translation of a Source form, including but not limited to compiled object code, |
|
||||||
generated documentation, and conversions to other media types. |
|
||||||
|
|
||||||
"Work" shall mean the work of authorship, whether in Source or Object form, made |
|
||||||
available under the License, as indicated by a copyright notice that is included |
|
||||||
in or attached to the work (an example is provided in the Appendix below). |
|
||||||
|
|
||||||
"Derivative Works" shall mean any work, whether in Source or Object form, that |
|
||||||
is based on (or derived from) the Work and for which the editorial revisions, |
|
||||||
annotations, elaborations, or other modifications represent, as a whole, an |
|
||||||
original work of authorship. For the purposes of this License, Derivative Works |
|
||||||
shall not include works that remain separable from, or merely link (or bind by |
|
||||||
name) to the interfaces of, the Work and Derivative Works thereof. |
|
||||||
|
|
||||||
"Contribution" shall mean any work of authorship, including the original version |
|
||||||
of the Work and any modifications or additions to that Work or Derivative Works |
|
||||||
thereof, that is intentionally submitted to Licensor for inclusion in the Work |
|
||||||
by the copyright owner or by an individual or Legal Entity authorized to submit |
|
||||||
on behalf of the copyright owner. For the purposes of this definition, |
|
||||||
"submitted" means any form of electronic, verbal, or written communication sent |
|
||||||
to the Licensor or its representatives, including but not limited to |
|
||||||
communication on electronic mailing lists, source code control systems, and |
|
||||||
issue tracking systems that are managed by, or on behalf of, the Licensor for |
|
||||||
the purpose of discussing and improving the Work, but excluding communication |
|
||||||
that is conspicuously marked or otherwise designated in writing by the copyright |
|
||||||
owner as "Not a Contribution." |
|
||||||
|
|
||||||
"Contributor" shall mean Licensor and any individual or Legal Entity on behalf |
|
||||||
of whom a Contribution has been received by Licensor and subsequently |
|
||||||
incorporated within the Work. |
|
||||||
|
|
||||||
2. Grant of Copyright License. |
|
||||||
|
|
||||||
Subject to the terms and conditions of this License, each Contributor hereby |
|
||||||
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, |
|
||||||
irrevocable copyright license to reproduce, prepare Derivative Works of, |
|
||||||
publicly display, publicly perform, sublicense, and distribute the Work and such |
|
||||||
Derivative Works in Source or Object form. |
|
||||||
|
|
||||||
3. Grant of Patent License. |
|
||||||
|
|
||||||
Subject to the terms and conditions of this License, each Contributor hereby |
|
||||||
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, |
|
||||||
irrevocable (except as stated in this section) patent license to make, have |
|
||||||
made, use, offer to sell, sell, import, and otherwise transfer the Work, where |
|
||||||
such license applies only to those patent claims licensable by such Contributor |
|
||||||
that are necessarily infringed by their Contribution(s) alone or by combination |
|
||||||
of their Contribution(s) with the Work to which such Contribution(s) was |
|
||||||
submitted. If You institute patent litigation against any entity (including a |
|
||||||
cross-claim or counterclaim in a lawsuit) alleging that the Work or a |
|
||||||
Contribution incorporated within the Work constitutes direct or contributory |
|
||||||
patent infringement, then any patent licenses granted to You under this License |
|
||||||
for that Work shall terminate as of the date such litigation is filed. |
|
||||||
|
|
||||||
4. Redistribution. |
|
||||||
|
|
||||||
You may reproduce and distribute copies of the Work or Derivative Works thereof |
|
||||||
in any medium, with or without modifications, and in Source or Object form, |
|
||||||
provided that You meet the following conditions: |
|
||||||
|
|
||||||
You must give any other recipients of the Work or Derivative Works a copy of |
|
||||||
this License; and |
|
||||||
You must cause any modified files to carry prominent notices stating that You |
|
||||||
changed the files; and |
|
||||||
You must retain, in the Source form of any Derivative Works that You distribute, |
|
||||||
all copyright, patent, trademark, and attribution notices from the Source form |
|
||||||
of the Work, excluding those notices that do not pertain to any part of the |
|
||||||
Derivative Works; and |
|
||||||
If the Work includes a "NOTICE" text file as part of its distribution, then any |
|
||||||
Derivative Works that You distribute must include a readable copy of the |
|
||||||
attribution notices contained within such NOTICE file, excluding those notices |
|
||||||
that do not pertain to any part of the Derivative Works, in at least one of the |
|
||||||
following places: within a NOTICE text file distributed as part of the |
|
||||||
Derivative Works; within the Source form or documentation, if provided along |
|
||||||
with the Derivative Works; or, within a display generated by the Derivative |
|
||||||
Works, if and wherever such third-party notices normally appear. The contents of |
|
||||||
the NOTICE file are for informational purposes only and do not modify the |
|
||||||
License. You may add Your own attribution notices within Derivative Works that |
|
||||||
You distribute, alongside or as an addendum to the NOTICE text from the Work, |
|
||||||
provided that such additional attribution notices cannot be construed as |
|
||||||
modifying the License. |
|
||||||
You may add Your own copyright statement to Your modifications and may provide |
|
||||||
additional or different license terms and conditions for use, reproduction, or |
|
||||||
distribution of Your modifications, or for any such Derivative Works as a whole, |
|
||||||
provided Your use, reproduction, and distribution of the Work otherwise complies |
|
||||||
with the conditions stated in this License. |
|
||||||
|
|
||||||
5. Submission of Contributions. |
|
||||||
|
|
||||||
Unless You explicitly state otherwise, any Contribution intentionally submitted |
|
||||||
for inclusion in the Work by You to the Licensor shall be under the terms and |
|
||||||
conditions of this License, without any additional terms or conditions. |
|
||||||
Notwithstanding the above, nothing herein shall supersede or modify the terms of |
|
||||||
any separate license agreement you may have executed with Licensor regarding |
|
||||||
such Contributions. |
|
||||||
|
|
||||||
6. Trademarks. |
|
||||||
|
|
||||||
This License does not grant permission to use the trade names, trademarks, |
|
||||||
service marks, or product names of the Licensor, except as required for |
|
||||||
reasonable and customary use in describing the origin of the Work and |
|
||||||
reproducing the content of the NOTICE file. |
|
||||||
|
|
||||||
7. Disclaimer of Warranty. |
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, Licensor provides the |
|
||||||
Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, |
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, |
|
||||||
including, without limitation, any warranties or conditions of TITLE, |
|
||||||
NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are |
|
||||||
solely responsible for determining the appropriateness of using or |
|
||||||
redistributing the Work and assume any risks associated with Your exercise of |
|
||||||
permissions under this License. |
|
||||||
|
|
||||||
8. Limitation of Liability. |
|
||||||
|
|
||||||
In no event and under no legal theory, whether in tort (including negligence), |
|
||||||
contract, or otherwise, unless required by applicable law (such as deliberate |
|
||||||
and grossly negligent acts) or agreed to in writing, shall any Contributor be |
|
||||||
liable to You for damages, including any direct, indirect, special, incidental, |
|
||||||
or consequential damages of any character arising as a result of this License or |
|
||||||
out of the use or inability to use the Work (including but not limited to |
|
||||||
damages for loss of goodwill, work stoppage, computer failure or malfunction, or |
|
||||||
any and all other commercial damages or losses), even if such Contributor has |
|
||||||
been advised of the possibility of such damages. |
|
||||||
|
|
||||||
9. Accepting Warranty or Additional Liability. |
|
||||||
|
|
||||||
While redistributing the Work or Derivative Works thereof, You may choose to |
|
||||||
offer, and charge a fee for, acceptance of support, warranty, indemnity, or |
|
||||||
other liability obligations and/or rights consistent with this License. However, |
|
||||||
in accepting such obligations, You may act only on Your own behalf and on Your |
|
||||||
sole responsibility, not on behalf of any other Contributor, and only if You |
|
||||||
agree to indemnify, defend, and hold each Contributor harmless for any liability |
|
||||||
incurred by, or claims asserted against, such Contributor by reason of your |
|
||||||
accepting any such warranty or additional liability. |
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS |
|
||||||
|
|
||||||
APPENDIX: How to apply the Apache License to your work |
|
||||||
|
|
||||||
To apply the Apache License to your work, attach the following boilerplate |
|
||||||
notice, with the fields enclosed by brackets "[]" replaced with your own |
|
||||||
identifying information. (Don't include the brackets!) The text should be |
|
||||||
enclosed in the appropriate comment syntax for the file format. We also |
|
||||||
recommend that a file or class name and description of purpose be included on |
|
||||||
the same "printed page" as the copyright notice for easier identification within |
|
||||||
third-party archives. |
|
||||||
|
|
||||||
Copyright [yyyy] [name of copyright owner] |
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License"); |
|
||||||
you may not use this file except in compliance with the License. |
|
||||||
You may obtain a copy of the License at |
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0 |
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software |
|
||||||
distributed under the License is distributed on an "AS IS" BASIS, |
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|
||||||
See the License for the specific language governing permissions and |
|
||||||
limitations under the License. |
|
||||||
|
|||||||
@ -1,44 +0,0 @@ |
|||||||
glog |
|
||||||
==== |
|
||||||
|
|
||||||
Leveled execution logs for Go. |
|
||||||
|
|
||||||
This is an efficient pure Go implementation of leveled logs in the |
|
||||||
manner of the open source C++ package |
|
||||||
http://code.google.com/p/google-glog |
|
||||||
|
|
||||||
By binding methods to booleans it is possible to use the log package |
|
||||||
without paying the expense of evaluating the arguments to the log. |
|
||||||
Through the -vmodule flag, the package also provides fine-grained |
|
||||||
control over logging at the file level. |
|
||||||
|
|
||||||
The comment from glog.go introduces the ideas: |
|
||||||
|
|
||||||
Package glog implements logging analogous to the Google-internal |
|
||||||
C++ INFO/ERROR/V setup. It provides functions Info, Warning, |
|
||||||
Error, Fatal, plus formatting variants such as Infof. It |
|
||||||
also provides V-style logging controlled by the -v and |
|
||||||
-vmodule=file=2 flags. |
|
||||||
|
|
||||||
Basic examples: |
|
||||||
|
|
||||||
glog.Info("Prepare to repel boarders") |
|
||||||
|
|
||||||
glog.Fatalf("Initialization failed: %s", err) |
|
||||||
|
|
||||||
See the documentation for the V function for an explanation |
|
||||||
of these examples: |
|
||||||
|
|
||||||
if glog.V(2) { |
|
||||||
glog.Info("Starting transaction...") |
|
||||||
} |
|
||||||
|
|
||||||
glog.V(2).Infoln("Processed", nItems, "elements") |
|
||||||
|
|
||||||
|
|
||||||
The repository contains an open source version of the log package |
|
||||||
used inside Google. The master copy of the source lives inside |
|
||||||
Google, not here. The code in this repo is for export only and is not itself |
|
||||||
under development. Feature requests will be ignored. |
|
||||||
|
|
||||||
Send bug reports to golang-nuts@googlegroups.com. |
|
||||||
@ -0,0 +1,65 @@ |
|||||||
|
# glog-gokit |
||||||
|
|
||||||
|
This packages is a replacement for [glog](github.com/golang/glog) |
||||||
|
in projects that use the [go-kit logger](https://godoc.org/github.com/go-kit/kit/log). |
||||||
|
|
||||||
|
It is inspired by istio's glog package for zap: |
||||||
|
https://github.com/istio/glog |
||||||
|
|
||||||
|
## Usage |
||||||
|
|
||||||
|
Override the official glog package with this one. |
||||||
|
This simply replaces the code in `vendor/golang/glog` with the code of this package. |
||||||
|
|
||||||
|
In your `Gopkg.toml`: |
||||||
|
```toml |
||||||
|
[[override]] |
||||||
|
name = "github.com/golang/glog" |
||||||
|
source = "github.com/kubermatic/glog-gokit" |
||||||
|
``` |
||||||
|
|
||||||
|
In your `main.go`: |
||||||
|
```go |
||||||
|
// Import the package like it is original glog |
||||||
|
import "github.com/golang/glog" |
||||||
|
|
||||||
|
|
||||||
|
// Create go-kit logger in your main.go |
||||||
|
logger := log.NewLogfmtLogger(log.NewSyncWriter(os.Stdout)) |
||||||
|
logger = log.With(logger, "ts", log.DefaultTimestampUTC) |
||||||
|
logger = log.With(logger, "caller", log.DefaultCaller) |
||||||
|
logger = level.NewFilter(logger, level.AllowAll()) |
||||||
|
|
||||||
|
// Overriding the default glog with our go-kit glog implementation. |
||||||
|
// Thus we need to pass it our go-kit logger object. |
||||||
|
glog.SetLogger(logger) |
||||||
|
``` |
||||||
|
|
||||||
|
Setting the logger to the glog package **MUST** happen before using glog in any package. |
||||||
|
|
||||||
|
## Function Levels |
||||||
|
|
||||||
|
| glog | gokit | |
||||||
|
| ------------ | ----- | |
||||||
|
| Info | Debug | |
||||||
|
| InfoDepth | Debug | |
||||||
|
| Infof | Debug | |
||||||
|
| Infoln | Debug | |
||||||
|
| Warning | Warn | |
||||||
|
| WarningDepth | Warn | |
||||||
|
| Warningf | Warn | |
||||||
|
| Warningln | Warn | |
||||||
|
| Error | Error | |
||||||
|
| ErrorDepth | Error | |
||||||
|
| Errorf | Error | |
||||||
|
| Errorln | Error | |
||||||
|
| Exit | Error | |
||||||
|
| ExitDepth | Error | |
||||||
|
| Exitf | Error | |
||||||
|
| Exitln | Error | |
||||||
|
| Fatal | Error | |
||||||
|
| FatalDepth | Error | |
||||||
|
| Fatalf | Error | |
||||||
|
| Fatalln | Error | |
||||||
|
|
||||||
|
This table is rather opinionated and build for use with the Kubernetes' [Go client](https://github.com/kubernetes/client-go). |
||||||
File diff suppressed because it is too large
Load Diff
@ -1,124 +0,0 @@ |
|||||||
// Go support for leveled logs, analogous to https://code.google.com/p/google-glog/
|
|
||||||
//
|
|
||||||
// Copyright 2013 Google Inc. All Rights Reserved.
|
|
||||||
//
|
|
||||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
// you may not use this file except in compliance with the License.
|
|
||||||
// You may obtain a copy of the License at
|
|
||||||
//
|
|
||||||
// http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
//
|
|
||||||
// Unless required by applicable law or agreed to in writing, software
|
|
||||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
// See the License for the specific language governing permissions and
|
|
||||||
// limitations under the License.
|
|
||||||
|
|
||||||
// File I/O for logs.
|
|
||||||
|
|
||||||
package glog |
|
||||||
|
|
||||||
import ( |
|
||||||
"errors" |
|
||||||
"flag" |
|
||||||
"fmt" |
|
||||||
"os" |
|
||||||
"os/user" |
|
||||||
"path/filepath" |
|
||||||
"strings" |
|
||||||
"sync" |
|
||||||
"time" |
|
||||||
) |
|
||||||
|
|
||||||
// MaxSize is the maximum size of a log file in bytes.
|
|
||||||
var MaxSize uint64 = 1024 * 1024 * 1800 |
|
||||||
|
|
||||||
// logDirs lists the candidate directories for new log files.
|
|
||||||
var logDirs []string |
|
||||||
|
|
||||||
// If non-empty, overrides the choice of directory in which to write logs.
|
|
||||||
// See createLogDirs for the full list of possible destinations.
|
|
||||||
var logDir = flag.String("log_dir", "", "If non-empty, write log files in this directory") |
|
||||||
|
|
||||||
func createLogDirs() { |
|
||||||
if *logDir != "" { |
|
||||||
logDirs = append(logDirs, *logDir) |
|
||||||
} |
|
||||||
logDirs = append(logDirs, os.TempDir()) |
|
||||||
} |
|
||||||
|
|
||||||
var ( |
|
||||||
pid = os.Getpid() |
|
||||||
program = filepath.Base(os.Args[0]) |
|
||||||
host = "unknownhost" |
|
||||||
userName = "unknownuser" |
|
||||||
) |
|
||||||
|
|
||||||
func init() { |
|
||||||
h, err := os.Hostname() |
|
||||||
if err == nil { |
|
||||||
host = shortHostname(h) |
|
||||||
} |
|
||||||
|
|
||||||
current, err := user.Current() |
|
||||||
if err == nil { |
|
||||||
userName = current.Username |
|
||||||
} |
|
||||||
|
|
||||||
// Sanitize userName since it may contain filepath separators on Windows.
|
|
||||||
userName = strings.Replace(userName, `\`, "_", -1) |
|
||||||
} |
|
||||||
|
|
||||||
// shortHostname returns its argument, truncating at the first period.
|
|
||||||
// For instance, given "www.google.com" it returns "www".
|
|
||||||
func shortHostname(hostname string) string { |
|
||||||
if i := strings.Index(hostname, "."); i >= 0 { |
|
||||||
return hostname[:i] |
|
||||||
} |
|
||||||
return hostname |
|
||||||
} |
|
||||||
|
|
||||||
// logName returns a new log file name containing tag, with start time t, and
|
|
||||||
// the name for the symlink for tag.
|
|
||||||
func logName(tag string, t time.Time) (name, link string) { |
|
||||||
name = fmt.Sprintf("%s.%s.%s.log.%s.%04d%02d%02d-%02d%02d%02d.%d", |
|
||||||
program, |
|
||||||
host, |
|
||||||
userName, |
|
||||||
tag, |
|
||||||
t.Year(), |
|
||||||
t.Month(), |
|
||||||
t.Day(), |
|
||||||
t.Hour(), |
|
||||||
t.Minute(), |
|
||||||
t.Second(), |
|
||||||
pid) |
|
||||||
return name, program + "." + tag |
|
||||||
} |
|
||||||
|
|
||||||
var onceLogDirs sync.Once |
|
||||||
|
|
||||||
// create creates a new log file and returns the file and its filename, which
|
|
||||||
// contains tag ("INFO", "FATAL", etc.) and t. If the file is created
|
|
||||||
// successfully, create also attempts to update the symlink for that tag, ignoring
|
|
||||||
// errors.
|
|
||||||
func create(tag string, t time.Time) (f *os.File, filename string, err error) { |
|
||||||
onceLogDirs.Do(createLogDirs) |
|
||||||
if len(logDirs) == 0 { |
|
||||||
return nil, "", errors.New("log: no log dirs") |
|
||||||
} |
|
||||||
name, link := logName(tag, t) |
|
||||||
var lastErr error |
|
||||||
for _, dir := range logDirs { |
|
||||||
fname := filepath.Join(dir, name) |
|
||||||
f, err := os.Create(fname) |
|
||||||
if err == nil { |
|
||||||
symlink := filepath.Join(dir, link) |
|
||||||
os.Remove(symlink) // ignore err
|
|
||||||
os.Symlink(name, symlink) // ignore err
|
|
||||||
return f, fname, nil |
|
||||||
} |
|
||||||
lastErr = err |
|
||||||
} |
|
||||||
return nil, "", fmt.Errorf("log: cannot create log: %v", lastErr) |
|
||||||
} |
|
||||||
Loading…
Reference in new issue