From b2fa5f9852d41638566dabc2200d126641d0f5e4 Mon Sep 17 00:00:00 2001 From: Pavol Loffay Date: Fri, 8 Feb 2019 16:52:48 +0100 Subject: [PATCH] Wrap errors Signed-off-by: Pavol Loffay --- plugin/storage/es/factory.go | 7 +++---- plugin/storage/es/factory_test.go | 4 ++-- plugin/storage/es/options.go | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/plugin/storage/es/factory.go b/plugin/storage/es/factory.go index 251b67e80f2..597d1c45819 100644 --- a/plugin/storage/es/factory.go +++ b/plugin/storage/es/factory.go @@ -21,6 +21,7 @@ import ( "path/filepath" "strings" + "github.com/pkg/errors" "github.com/spf13/viper" "github.com/uber/jaeger-lib/metrics" "go.uber.org/zap" @@ -76,14 +77,12 @@ func (f *Factory) Initialize(metricsFactory metrics.Factory, logger *zap.Logger) primaryClient, err := f.primaryConfig.NewClient(logger, metricsFactory) if err != nil { - f.logger.Error("failed to create primary Elasticsearch client", zap.Error(err)) - return err + return errors.Wrap(err, "failed to create primary Elasticsearch client") } f.primaryClient = primaryClient archiveClient, err := f.archiveConfig.NewClient(logger, metricsFactory) if err != nil { - f.logger.Error("failed to create archive Elasticsearch client", zap.Error(err)) - return err + return errors.Wrap(err, "failed to create archive Elasticsearch client") } f.archiveClient = archiveClient return nil diff --git a/plugin/storage/es/factory_test.go b/plugin/storage/es/factory_test.go index db04e42fdb2..ded464329da 100644 --- a/plugin/storage/es/factory_test.go +++ b/plugin/storage/es/factory_test.go @@ -53,11 +53,11 @@ func TestElasticsearchFactory(t *testing.T) { // after InitFromViper, f.primaryConfig points to a real session builder that will fail in unit tests, // so we override it with a mock. f.primaryConfig = &mockClientBuilder{err: errors.New("made-up error")} - assert.EqualError(t, f.Initialize(metrics.NullFactory, zap.NewNop()), "made-up error") + assert.EqualError(t, f.Initialize(metrics.NullFactory, zap.NewNop()), "failed to create primary Elasticsearch client: made-up error") f.primaryConfig = &mockClientBuilder{} f.archiveConfig = &mockClientBuilder{err: errors.New("made-up error2")} - assert.EqualError(t, f.Initialize(metrics.NullFactory, zap.NewNop()), "made-up error2") + assert.EqualError(t, f.Initialize(metrics.NullFactory, zap.NewNop()), "failed to create archive Elasticsearch client: made-up error2") f.archiveConfig = &mockClientBuilder{} assert.NoError(t, f.Initialize(metrics.NullFactory, zap.NewNop())) diff --git a/plugin/storage/es/options.go b/plugin/storage/es/options.go index 9573f4cb54f..db793ca335f 100644 --- a/plugin/storage/es/options.go +++ b/plugin/storage/es/options.go @@ -123,7 +123,7 @@ func addFlags(flagSet *flag.FlagSet, nsConfig *namespaceConfig) { flagSet.String( nsConfig.namespace+suffixTokenPath, nsConfig.TokenFilePath, - "Path to a file containing bearer token. This flag also uses "+suffixCA+" if it is specified") + "Path to a file containing bearer token. This flag also uses CA if it is specified") flagSet.Bool( nsConfig.namespace+suffixSniffer, nsConfig.Sniffer,