3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-04-29 18:36:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #239 from desimone/telemetry-refactor-package-messages

Browse source 
telemetry: fix package name in messages
This commit is contained in:
Bobby DeSimone 2019-07-24 15:52:33 -07:00 • committed by GitHub
commit 337f90ecfb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal/telemetry/metrics/grpc.go
View file

@ -137,7 +137,7 @@ func GRPCClientInterceptor(service string) grpc.UnaryClientInterceptor {
tag.Insert(TagKeyGRPCService, rpcService), tag.Insert(TagKeyGRPCService, rpcService),
) )
if tagErr != nil { if tagErr != nil {
log.Warn().Err(tagErr).Str("context", "GRPCClientInterceptor").Msg("internal/telemetry: Failed to create context") log.Warn().Err(tagErr).Str("context", "GRPCClientInterceptor").Msg("telemetry/metrics: failed to create context")
return invoker(ctx, method, req, reply, cc, opts...) return invoker(ctx, method, req, reply, cc, opts...)
} }
@ -175,7 +175,7 @@ func (h *GRPCServerStatsHandler) TagRPC(ctx context.Context, tagInfo *grpcstats.
tag.Insert(TagKeyGRPCService, rpcService), tag.Insert(TagKeyGRPCService, rpcService),
) )
if tagErr != nil { if tagErr != nil {
log.Warn().Err(tagErr).Str("context", "GRPCServerStatsHandler").Msg("internal/telemetry: Failed to create context") log.Warn().Err(tagErr).Str("context", "GRPCServerStatsHandler").Msg("telemetry/metrics: failed to create context")
return handledCtx return handledCtx
} }

3
internal/telemetry/metrics/http.go
View file

@ -117,8 +117,7 @@ func HTTPMetricsHandler(service string) func(next http.Handler) http.Handler {
tag.Insert(TagKeyHTTPMethod, r.Method), tag.Insert(TagKeyHTTPMethod, r.Method),
) )
if tagErr != nil { if tagErr != nil {
log.Warn().Err(tagErr).Str("context", "HTTPMetricsHandler"). log.Warn().Err(tagErr).Str("context", "HTTPMetricsHandler").Msg("telemetry/metrics: failed to create metrics tag")
Msg("telemetry/metrics: failed to create metrics tag")
next.ServeHTTP(w, r) next.ServeHTTP(w, r)
return return
} }

16
internal/telemetry/metrics/info.go
View file

@ -64,7 +64,7 @@ func SetConfigInfo(service string, success bool, checksum string) {
[]tag.Mutator{serviceTag}, []tag.Mutator{serviceTag},
configLastReload.M(time.Now().Unix()), configLastReload.M(time.Now().Unix()),
); err != nil { ); err != nil {
log.Error().Err(err).Msg("internal/telemetry: failed to record config checksum timestamp") log.Error().Err(err).Msg("telemetry/metrics: failed to record config checksum timestamp")
} }
if err := stats.RecordWithTags( if err := stats.RecordWithTags(
@ -72,7 +72,7 @@ func SetConfigInfo(service string, success bool, checksum string) {
[]tag.Mutator{serviceTag}, []tag.Mutator{serviceTag},
configLastReloadSuccess.M(1), configLastReloadSuccess.M(1),
); err != nil { ); err != nil {
log.Error().Err(err).Msg("internal/telemetry: failed to record config reload") log.Error().Err(err).Msg("telemetry/metrics: failed to record config reload")
} }
} else { } else {
stats.Record(context.Background(), configLastReloadSuccess.M(0)) stats.Record(context.Background(), configLastReloadSuccess.M(0))
@ -106,7 +106,7 @@ func (r *metricRegistry) init() {
metric.WithLabelKeys("service", "version", "revision", "goversion"), metric.WithLabelKeys("service", "version", "revision", "goversion"),
) )
if err != nil { if err != nil {
log.Error().Err(err).Msg("internal/telemetry: failed to register build info metric") log.Error().Err(err).Msg("telemetry/metrics: failed to register build info metric")
} }
r.configChecksum, err = r.registry.AddFloat64Gauge("config_checksum_decimal", r.configChecksum, err = r.registry.AddFloat64Gauge("config_checksum_decimal",
@ -114,7 +114,7 @@ func (r *metricRegistry) init() {
metric.WithLabelKeys("service"), metric.WithLabelKeys("service"),
) )
if err != nil { if err != nil {
log.Error().Err(err).Msg("internal/telemetry: failed to register config checksum metric") log.Error().Err(err).Msg("telemetry/metrics: failed to register config checksum metric")
} }
r.policyCount, err = r.registry.AddInt64DerivedGauge("policy_count_total", r.policyCount, err = r.registry.AddInt64DerivedGauge("policy_count_total",
@ -122,7 +122,7 @@ func (r *metricRegistry) init() {
metric.WithLabelKeys("service"), metric.WithLabelKeys("service"),
) )
if err != nil { if err != nil {
log.Error().Err(err).Msg("internal/telemetry: failed to register policy count metric") log.Error().Err(err).Msg("telemetry/metrics: failed to register policy count metric")
} }
}) })
} }
@ -140,7 +140,7 @@ func (r *metricRegistry) setBuildInfo(service string) {
metricdata.NewLabelValue((runtime.Version())), metricdata.NewLabelValue((runtime.Version())),
) )
if err != nil { if err != nil {
log.Error().Err(err).Msg("internal/telemetry: failed to get build info metric") log.Error().Err(err).Msg("telemetry/metrics: failed to get build info metric")
} }
// This sets our build_info metric to a constant 1 per // This sets our build_info metric to a constant 1 per
@ -165,7 +165,7 @@ func (r *metricRegistry) setConfigChecksum(service string, checksum uint64) {
} }
m, err := r.configChecksum.GetEntry(metricdata.NewLabelValue(service)) m, err := r.configChecksum.GetEntry(metricdata.NewLabelValue(service))
if err != nil { if err != nil {
log.Error().Err(err).Msg("internal/telemetry: failed to get config checksum metric") log.Error().Err(err).Msg("telemetry/metrics: failed to get config checksum metric")
} }
m.Set(float64(checksum)) m.Set(float64(checksum))
} }
@ -182,7 +182,7 @@ func (r *metricRegistry) addPolicyCountCallback(service string, f func() int64)
} }
err := r.policyCount.UpsertEntry(f, metricdata.NewLabelValue(service)) err := r.policyCount.UpsertEntry(f, metricdata.NewLabelValue(service))
if err != nil { if err != nil {
log.Error().Err(err).Msg("internal/telemetry: failed to get policy count metric") log.Error().Err(err).Msg("telemetry/metrics: failed to get policy count metric")
} }
} }

4
internal/telemetry/metrics/providers.go
View file

@ -13,7 +13,7 @@ import (
// and returns a handler suitable for exporting metrics. // and returns a handler suitable for exporting metrics.
func PrometheusHandler() (http.Handler, error) { func PrometheusHandler() (http.Handler, error) {
if err := registerDefaultViews(); err != nil { if err := registerDefaultViews(); err != nil {
return nil, fmt.Errorf("internal/telemetry: failed registering views") return nil, fmt.Errorf("telemetry/metrics: failed registering views")
} }
reg := prom.DefaultRegisterer.(*prom.Registry) reg := prom.DefaultRegisterer.(*prom.Registry)
exporter, err := ocprom.NewExporter( exporter, err := ocprom.NewExporter(
@ -22,7 +22,7 @@ func PrometheusHandler() (http.Handler, error) {
Registry: reg, Registry: reg,
}) })
if err != nil { if err != nil {
return nil, fmt.Errorf("internal/telemetry: prometheus exporter: %v", err) return nil, fmt.Errorf("telemetry/metrics: prometheus exporter: %v", err)
} }
view.RegisterExporter(exporter) view.RegisterExporter(exporter)
mux := http.NewServeMux() mux := http.NewServeMux()