From 6b23e5ac9bce164b35fbc596c9e857ccaa14ac39 Mon Sep 17 00:00:00 2001 From: cachedout Date: Wed, 17 Jun 2020 12:55:15 +0200 Subject: [PATCH] Cherry-pick #19106 and #19161 to 7.x: Set ecszap version to v0.2.0 && fix lint job by updating NOTICE (#19234) * Set ecszap version to v0.2.0 (#19106) * Set ecszap version to v0.2.0 * Update go.sum for go.elastic.co/ecszap v0.2.0/ * fix lint job by updating NOTICE (#19161) Co-authored-by: Steffen Siering --- NOTICE.txt | 3 +-- go.mod | 2 +- go.sum | 4 ++-- vendor/modules.txt | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index c48bb54c675..b21547bb4cb 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -7841,8 +7841,7 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: go.elastic.co/ecszap -Version: v0.1.1 -Revision: cdd95a104193 +Version: v0.2.0 License type (autodetected): Apache-2.0 ./vendor/go.elastic.co/ecszap/LICENSE: -------------------------------------------------------------------- diff --git a/go.mod b/go.mod index 7232ca0d6f4..dd240f81b25 100644 --- a/go.mod +++ b/go.mod @@ -147,7 +147,7 @@ require ( go.elastic.co/apm v1.7.2 go.elastic.co/apm/module/apmelasticsearch v1.7.2 go.elastic.co/apm/module/apmhttp v1.7.2 - go.elastic.co/ecszap v0.1.1-0.20200424093508-cdd95a104193 + go.elastic.co/ecszap v0.2.0 go.uber.org/atomic v1.5.0 go.uber.org/multierr v1.3.0 go.uber.org/zap v1.14.0 diff --git a/go.sum b/go.sum index 92209737cd0..ac0f0ea5669 100644 --- a/go.sum +++ b/go.sum @@ -694,8 +694,8 @@ go.elastic.co/apm/module/apmelasticsearch v1.7.2 h1:5STGHLZLSeAzxordMc+dFVKiyVtM go.elastic.co/apm/module/apmelasticsearch v1.7.2/go.mod h1:ZyNFuyWdt42GBZkz0SogoLzDBrBGj4orxpiUuxYeYq8= go.elastic.co/apm/module/apmhttp v1.7.2 h1:2mRh7SwBuEVLmJlX+hsMdcSg9xaielCLElaPn/+i34w= go.elastic.co/apm/module/apmhttp v1.7.2/go.mod h1:sTFWiWejnhSdZv6+dMgxGec2Nxe/ZKfHfz/xtRM+cRY= -go.elastic.co/ecszap v0.1.1-0.20200424093508-cdd95a104193 h1:NjYJ/beChqugXSavTkH5tF6shvr/is8jdgJ331wfwT8= -go.elastic.co/ecszap v0.1.1-0.20200424093508-cdd95a104193/go.mod h1:HTUi+QRmr3EuZMqxPX+5fyOdMNfUu5iPebgfhgsTJYQ= +go.elastic.co/ecszap v0.2.0 h1:BSZNJ2MOIsecJ7L4ezUA+JIarx14wclqZLJm/mBj044= +go.elastic.co/ecszap v0.2.0/go.mod h1:HTUi+QRmr3EuZMqxPX+5fyOdMNfUu5iPebgfhgsTJYQ= go.elastic.co/fastjson v1.0.0 h1:ooXV/ABvf+tBul26jcVViPT3sBir0PvXgibYB1IQQzg= go.elastic.co/fastjson v1.0.0/go.mod h1:PmeUOMMtLHQr9ZS9J9owrAVg0FkaZDRZJEFTTGHtchs= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= diff --git a/vendor/modules.txt b/vendor/modules.txt index 790d5819927..5cd779c8e16 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -857,7 +857,7 @@ go.elastic.co/apm/transport/transporttest go.elastic.co/apm/module/apmelasticsearch # go.elastic.co/apm/module/apmhttp v1.7.2 go.elastic.co/apm/module/apmhttp -# go.elastic.co/ecszap v0.1.1-0.20200424093508-cdd95a104193 +# go.elastic.co/ecszap v0.2.0 go.elastic.co/ecszap go.elastic.co/ecszap/internal # go.elastic.co/fastjson v1.0.0