From da9e96b76415d79b3f9132e3849dfb399e00abce Mon Sep 17 00:00:00 2001 From: Bobby DeSimone Date: Wed, 24 Jul 2019 10:04:20 -0700 Subject: [PATCH] telemetry: fix package name in messages Signed-off-by: Bobby DeSimone --- internal/telemetry/metrics/grpc.go | 4 ++-- internal/telemetry/metrics/http.go | 3 +-- internal/telemetry/metrics/info.go | 16 ++++++++-------- internal/telemetry/metrics/providers.go | 4 ++-- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/internal/telemetry/metrics/grpc.go b/internal/telemetry/metrics/grpc.go index 04c2b3d66..a67afa528 100644 --- a/internal/telemetry/metrics/grpc.go +++ b/internal/telemetry/metrics/grpc.go @@ -137,7 +137,7 @@ func GRPCClientInterceptor(service string) grpc.UnaryClientInterceptor { tag.Insert(TagKeyGRPCService, rpcService), ) 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...) } @@ -175,7 +175,7 @@ func (h *GRPCServerStatsHandler) TagRPC(ctx context.Context, tagInfo *grpcstats. tag.Insert(TagKeyGRPCService, rpcService), ) 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 } diff --git a/internal/telemetry/metrics/http.go b/internal/telemetry/metrics/http.go index 9a2586208..9bad295ec 100644 --- a/internal/telemetry/metrics/http.go +++ b/internal/telemetry/metrics/http.go @@ -117,8 +117,7 @@ func HTTPMetricsHandler(service string) func(next http.Handler) http.Handler { tag.Insert(TagKeyHTTPMethod, r.Method), ) if tagErr != nil { - log.Warn().Err(tagErr).Str("context", "HTTPMetricsHandler"). - Msg("telemetry/metrics: failed to create metrics tag") + log.Warn().Err(tagErr).Str("context", "HTTPMetricsHandler").Msg("telemetry/metrics: failed to create metrics tag") next.ServeHTTP(w, r) return } diff --git a/internal/telemetry/metrics/info.go b/internal/telemetry/metrics/info.go index ec1f8f151..6fcc99d1a 100644 --- a/internal/telemetry/metrics/info.go +++ b/internal/telemetry/metrics/info.go @@ -64,7 +64,7 @@ func SetConfigInfo(service string, success bool, checksum string) { []tag.Mutator{serviceTag}, configLastReload.M(time.Now().Unix()), ); 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( @@ -72,7 +72,7 @@ func SetConfigInfo(service string, success bool, checksum string) { []tag.Mutator{serviceTag}, configLastReloadSuccess.M(1), ); 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 { stats.Record(context.Background(), configLastReloadSuccess.M(0)) @@ -106,7 +106,7 @@ func (r *metricRegistry) init() { metric.WithLabelKeys("service", "version", "revision", "goversion"), ) 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", @@ -114,7 +114,7 @@ func (r *metricRegistry) init() { metric.WithLabelKeys("service"), ) 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", @@ -122,7 +122,7 @@ func (r *metricRegistry) init() { metric.WithLabelKeys("service"), ) 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())), ) 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 @@ -165,7 +165,7 @@ func (r *metricRegistry) setConfigChecksum(service string, checksum uint64) { } m, err := r.configChecksum.GetEntry(metricdata.NewLabelValue(service)) 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)) } @@ -182,7 +182,7 @@ func (r *metricRegistry) addPolicyCountCallback(service string, f func() int64) } err := r.policyCount.UpsertEntry(f, metricdata.NewLabelValue(service)) 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") } } diff --git a/internal/telemetry/metrics/providers.go b/internal/telemetry/metrics/providers.go index c5ed505df..40ac906c2 100644 --- a/internal/telemetry/metrics/providers.go +++ b/internal/telemetry/metrics/providers.go @@ -13,7 +13,7 @@ import ( // and returns a handler suitable for exporting metrics. func PrometheusHandler() (http.Handler, error) { 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) exporter, err := ocprom.NewExporter( @@ -22,7 +22,7 @@ func PrometheusHandler() (http.Handler, error) { Registry: reg, }) 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) mux := http.NewServeMux()