Add query log (#6520)
* Add query log, make stats logged in JSON like in the API Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>pull/6583/head
Julien Pivotto
6 years ago
committed by
Brian Brazil
parent
3d6cf1c289
commit
9d9bc524e5
@ -0,0 +1,62 @@ |
||||
// Copyright 2020 The Prometheus Authors
|
||||
// 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.
|
||||
|
||||
package logging |
||||
|
||||
import ( |
||||
"os" |
||||
"time" |
||||
|
||||
"github.com/go-kit/kit/log" |
||||
"github.com/pkg/errors" |
||||
) |
||||
|
||||
var ( |
||||
timestampFormat = log.TimestampFormat( |
||||
func() time.Time { return time.Now().UTC() }, |
||||
"2006-01-02T15:04:05.000Z07:00", |
||||
) |
||||
) |
||||
|
||||
// JSONFileLogger represents a logger that writes JSON to a file.
|
||||
type JSONFileLogger struct { |
||||
logger log.Logger |
||||
file *os.File |
||||
} |
||||
|
||||
// NewJSONFileLogger returns a new JSONFileLogger.
|
||||
func NewJSONFileLogger(s string) (*JSONFileLogger, error) { |
||||
if s == "" { |
||||
return nil, nil |
||||
} |
||||
|
||||
f, err := os.OpenFile(s, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0666) |
||||
if err != nil { |
||||
return nil, errors.Wrap(err, "can't create json logger") |
||||
} |
||||
|
||||
return &JSONFileLogger{ |
||||
logger: log.With(log.NewJSONLogger(f), "ts", timestampFormat), |
||||
file: f, |
||||
}, nil |
||||
} |
||||
|
||||
// Close closes the underlying file.
|
||||
func (l *JSONFileLogger) Close() error { |
||||
return l.file.Close() |
||||
} |
||||
|
||||
// Log calls the Log function of the underlying logger.
|
||||
func (l *JSONFileLogger) Log(i ...interface{}) error { |
||||
return l.logger.Log(i...) |
||||
} |
||||
@ -0,0 +1,48 @@ |
||||
// Copyright 2020 The Prometheus Authors
|
||||
// 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.
|
||||
|
||||
package logging |
||||
|
||||
import ( |
||||
"errors" |
||||
"io/ioutil" |
||||
"os" |
||||
"regexp" |
||||
"testing" |
||||
|
||||
"github.com/prometheus/prometheus/util/testutil" |
||||
) |
||||
|
||||
func TestJSONFileLogger_basic(t *testing.T) { |
||||
f, err := ioutil.TempFile("", "") |
||||
testutil.Ok(t, err) |
||||
defer f.Close() |
||||
|
||||
l, err := NewJSONFileLogger(f.Name()) |
||||
testutil.Ok(t, err) |
||||
testutil.Assert(t, l != nil, "logger can't be nil") |
||||
|
||||
l.Log("test", "yes") |
||||
r := make([]byte, 1024) |
||||
_, err = f.Read(r) |
||||
testutil.Ok(t, err) |
||||
result, err := regexp.Match(`^{"test":"yes","ts":"[^"]+"}\n`, r) |
||||
testutil.Ok(t, err) |
||||
testutil.Assert(t, result, "unexpected content: %s", r) |
||||
|
||||
err = l.Close() |
||||
testutil.Ok(t, err) |
||||
|
||||
err = l.file.Close() |
||||
testutil.Assert(t, errors.Is(err, os.ErrClosed), "file was not closed") |
||||
} |
||||
Loading…
Reference in new issue