From 16a7861b99caecddd6622d9800b1726d7fa49b8c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 08:04:45 +0000 Subject: [PATCH 1/4] fix(deps): update module go.elastic.co/apm/module/apmelasticsearch/v2 to v2.6.0 --- go.mod | 6 +++--- go.sum | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 24722536ff..55df1b1a64 100644 --- a/go.mod +++ b/go.mod @@ -30,10 +30,10 @@ require ( github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.18.2 github.com/stretchr/testify v1.9.0 - go.elastic.co/apm/module/apmelasticsearch/v2 v2.5.0 - go.elastic.co/apm/module/apmhttp/v2 v2.5.0 + go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.0 + go.elastic.co/apm/module/apmhttp/v2 v2.6.0 go.elastic.co/apm/module/apmzap/v2 v2.5.0 - go.elastic.co/apm/v2 v2.5.0 + go.elastic.co/apm/v2 v2.6.0 go.uber.org/automaxprocs v1.5.3 go.uber.org/zap v1.27.0 golang.org/x/crypto v0.22.0 diff --git a/go.sum b/go.sum index 2af96a35ce..bdd2b5c35a 100644 --- a/go.sum +++ b/go.sum @@ -280,12 +280,18 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.elastic.co/apm/module/apmelasticsearch/v2 v2.5.0 h1:0S5Vj5/L4EkXQS7YUr+1ylTuB3njTuBNzdmn3mjXAFI= go.elastic.co/apm/module/apmelasticsearch/v2 v2.5.0/go.mod h1:zNEXwAPoThH/bAb3TWKD5Og0Zyk0OWURsEHAja1kra4= +go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.0 h1:ukMcwyMaDXsS1dRK2qRYXT2AsfwaUy74TOOYCqkWJow= +go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.0/go.mod h1:YpfiTTrqX5LB/CKBwX89oDCBAxuLJTFv40gcfxJyehM= go.elastic.co/apm/module/apmhttp/v2 v2.5.0 h1:4AWlw8giL7hRYBQiwF1/Thm0GDsbQH/Ofe4eySAnURo= go.elastic.co/apm/module/apmhttp/v2 v2.5.0/go.mod h1:ZP7gLEzY/OAPTqNZjp8AzA06HF82zfwXEpKI2sSVTgk= +go.elastic.co/apm/module/apmhttp/v2 v2.6.0 h1:s8UeNFQmVBCNd4eoz7KDD9rEFhQC0HeUFXz3z9gpAmQ= +go.elastic.co/apm/module/apmhttp/v2 v2.6.0/go.mod h1:D0GLppLuI0Ddwvtl595GUxRgn6Z8L5KaDFVMv2H3GK0= go.elastic.co/apm/module/apmzap/v2 v2.5.0 h1:COXqVte4i75XQmV+H4m4g+2JubK3Y1WRIzY/ppKa3bQ= go.elastic.co/apm/module/apmzap/v2 v2.5.0/go.mod h1:PHKFbSROQPFZ2+X3oZyaF8lie5DhK0gtcRMpz//S54g= go.elastic.co/apm/v2 v2.5.0 h1:UYqdu/bjcubcP9BIy5+os2ExRzw03yOQFG+sRGGhVlQ= go.elastic.co/apm/v2 v2.5.0/go.mod h1:+CiBUdrrAGnGCL9TNx7tQz3BrfYV23L8Ljvotoc87so= +go.elastic.co/apm/v2 v2.6.0 h1:VieBMLQFtXua2YxpYxaSdYGnmmxhLT46gosI5yErJgY= +go.elastic.co/apm/v2 v2.6.0/go.mod h1:33rOXgtHwbgZcDgi6I/GtCSMZQqgxkHC0IQT3gudKvo= go.elastic.co/fastjson v1.3.0 h1:hJO3OsYIhiqiT4Fgu0ZxAECnKASbwgiS+LMW5oCopKs= go.elastic.co/fastjson v1.3.0/go.mod h1:K9vDh7O0ODsVKV2B5e2XYLY277QZaCbB3tS1SnARvko= go.uber.org/automaxprocs v1.5.3 h1:kWazyxZUrS3Gs4qUpbwo5kEIMGe/DAvi5Z4tl2NW4j8= From 20fa20589eca3362b341571855860634a1047dbb Mon Sep 17 00:00:00 2001 From: Thibault Richard Date: Mon, 15 Apr 2024 10:20:39 +0200 Subject: [PATCH 2/4] Bump go.elastic.co/apm/module/apmzap/v2 v2.6.0 --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 55df1b1a64..44e46ad916 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( github.com/stretchr/testify v1.9.0 go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.0 go.elastic.co/apm/module/apmhttp/v2 v2.6.0 - go.elastic.co/apm/module/apmzap/v2 v2.5.0 + go.elastic.co/apm/module/apmzap/v2 v2.6.0 go.elastic.co/apm/v2 v2.6.0 go.uber.org/automaxprocs v1.5.3 go.uber.org/zap v1.27.0 From 145830f5dbd53fe78e4bf6c9d0d07e65490832c0 Mon Sep 17 00:00:00 2001 From: Thibault Richard Date: Mon, 15 Apr 2024 10:20:54 +0200 Subject: [PATCH 3/4] go mod tidy --- go.sum | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/go.sum b/go.sum index bdd2b5c35a..284f83c480 100644 --- a/go.sum +++ b/go.sum @@ -278,18 +278,12 @@ github.com/vbatts/tar-split v0.11.3/go.mod h1:9QlHN18E+fEH7RdG+QAJJcuya3rqT7eXST github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.elastic.co/apm/module/apmelasticsearch/v2 v2.5.0 h1:0S5Vj5/L4EkXQS7YUr+1ylTuB3njTuBNzdmn3mjXAFI= -go.elastic.co/apm/module/apmelasticsearch/v2 v2.5.0/go.mod h1:zNEXwAPoThH/bAb3TWKD5Og0Zyk0OWURsEHAja1kra4= go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.0 h1:ukMcwyMaDXsS1dRK2qRYXT2AsfwaUy74TOOYCqkWJow= go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.0/go.mod h1:YpfiTTrqX5LB/CKBwX89oDCBAxuLJTFv40gcfxJyehM= -go.elastic.co/apm/module/apmhttp/v2 v2.5.0 h1:4AWlw8giL7hRYBQiwF1/Thm0GDsbQH/Ofe4eySAnURo= -go.elastic.co/apm/module/apmhttp/v2 v2.5.0/go.mod h1:ZP7gLEzY/OAPTqNZjp8AzA06HF82zfwXEpKI2sSVTgk= go.elastic.co/apm/module/apmhttp/v2 v2.6.0 h1:s8UeNFQmVBCNd4eoz7KDD9rEFhQC0HeUFXz3z9gpAmQ= go.elastic.co/apm/module/apmhttp/v2 v2.6.0/go.mod h1:D0GLppLuI0Ddwvtl595GUxRgn6Z8L5KaDFVMv2H3GK0= -go.elastic.co/apm/module/apmzap/v2 v2.5.0 h1:COXqVte4i75XQmV+H4m4g+2JubK3Y1WRIzY/ppKa3bQ= -go.elastic.co/apm/module/apmzap/v2 v2.5.0/go.mod h1:PHKFbSROQPFZ2+X3oZyaF8lie5DhK0gtcRMpz//S54g= -go.elastic.co/apm/v2 v2.5.0 h1:UYqdu/bjcubcP9BIy5+os2ExRzw03yOQFG+sRGGhVlQ= -go.elastic.co/apm/v2 v2.5.0/go.mod h1:+CiBUdrrAGnGCL9TNx7tQz3BrfYV23L8Ljvotoc87so= +go.elastic.co/apm/module/apmzap/v2 v2.6.0 h1:R/iVORzGu3F9uM43iEVHD0nwiRo59O0bIXdayKsgayQ= +go.elastic.co/apm/module/apmzap/v2 v2.6.0/go.mod h1:B3i/8xRkqLgi6zNuV+Bp7Pt4cutaOObvrVSa7wUTAPw= go.elastic.co/apm/v2 v2.6.0 h1:VieBMLQFtXua2YxpYxaSdYGnmmxhLT46gosI5yErJgY= go.elastic.co/apm/v2 v2.6.0/go.mod h1:33rOXgtHwbgZcDgi6I/GtCSMZQqgxkHC0IQT3gudKvo= go.elastic.co/fastjson v1.3.0 h1:hJO3OsYIhiqiT4Fgu0ZxAECnKASbwgiS+LMW5oCopKs= From 8b073eb00a3ff1cb3026a117198e5c131bd2ab8e Mon Sep 17 00:00:00 2001 From: Thibault Richard Date: Mon, 15 Apr 2024 10:21:52 +0200 Subject: [PATCH 4/4] make generate --- NOTICE.txt | 24 ++++++++++++------------ docs/reference/dependencies.asciidoc | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 68e075c0fc..90b2347c55 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -2914,11 +2914,11 @@ SOFTWARE. -------------------------------------------------------------------------------- Module : go.elastic.co/apm/module/apmelasticsearch/v2 -Version : v2.5.0 -Time : 2024-03-12T18:37:50Z +Version : v2.6.0 +Time : 2024-04-11T12:45:42Z Licence : Apache-2.0 -Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasticsearch/v2@v2.5.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasticsearch/v2@v2.6.0/LICENSE: Apache License Version 2.0, January 2004 @@ -3125,11 +3125,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasti -------------------------------------------------------------------------------- Module : go.elastic.co/apm/module/apmhttp/v2 -Version : v2.5.0 -Time : 2024-03-12T18:37:50Z +Version : v2.6.0 +Time : 2024-04-11T12:45:42Z Licence : Apache-2.0 -Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v2@v2.5.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v2@v2.6.0/LICENSE: Apache License Version 2.0, January 2004 @@ -3336,11 +3336,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v -------------------------------------------------------------------------------- Module : go.elastic.co/apm/module/apmzap/v2 -Version : v2.5.0 -Time : 2024-03-12T18:37:50Z +Version : v2.6.0 +Time : 2024-04-11T12:45:42Z Licence : Apache-2.0 -Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmzap/v2@v2.5.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmzap/v2@v2.6.0/LICENSE: Apache License Version 2.0, January 2004 @@ -3547,11 +3547,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmzap/v2 -------------------------------------------------------------------------------- Module : go.elastic.co/apm/v2 -Version : v2.5.0 -Time : 2024-03-12T18:37:50Z +Version : v2.6.0 +Time : 2024-04-11T12:45:42Z Licence : Apache-2.0 -Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/v2@v2.5.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/v2@v2.6.0/LICENSE: Apache License Version 2.0, January 2004 diff --git a/docs/reference/dependencies.asciidoc b/docs/reference/dependencies.asciidoc index 123b232636..62043ddb75 100644 --- a/docs/reference/dependencies.asciidoc +++ b/docs/reference/dependencies.asciidoc @@ -44,10 +44,10 @@ This page lists the third-party dependencies used to build {n}. | link:https://github.com/spf13/pflag[$$github.com/spf13/pflag$$] | v1.0.5 | BSD-3-Clause | link:https://github.com/spf13/viper[$$github.com/spf13/viper$$] | v1.18.2 | MIT | link:https://github.com/stretchr/testify[$$github.com/stretchr/testify$$] | v1.9.0 | MIT -| link:https://go.elastic.co/apm/module/apmelasticsearch/v2[$$go.elastic.co/apm/module/apmelasticsearch/v2$$] | v2.5.0 | Apache-2.0 -| link:https://go.elastic.co/apm/module/apmhttp/v2[$$go.elastic.co/apm/module/apmhttp/v2$$] | v2.5.0 | Apache-2.0 -| link:https://go.elastic.co/apm/module/apmzap/v2[$$go.elastic.co/apm/module/apmzap/v2$$] | v2.5.0 | Apache-2.0 -| link:https://go.elastic.co/apm/v2[$$go.elastic.co/apm/v2$$] | v2.5.0 | Apache-2.0 +| link:https://go.elastic.co/apm/module/apmelasticsearch/v2[$$go.elastic.co/apm/module/apmelasticsearch/v2$$] | v2.6.0 | Apache-2.0 +| link:https://go.elastic.co/apm/module/apmhttp/v2[$$go.elastic.co/apm/module/apmhttp/v2$$] | v2.6.0 | Apache-2.0 +| link:https://go.elastic.co/apm/module/apmzap/v2[$$go.elastic.co/apm/module/apmzap/v2$$] | v2.6.0 | Apache-2.0 +| link:https://go.elastic.co/apm/v2[$$go.elastic.co/apm/v2$$] | v2.6.0 | Apache-2.0 | link:https://go.uber.org/automaxprocs[$$go.uber.org/automaxprocs$$] | v1.5.3 | MIT | link:https://go.uber.org/zap[$$go.uber.org/zap$$] | v1.27.0 | MIT | link:https://golang.org/x/crypto[$$golang.org/x/crypto$$] | v0.22.0 | BSD-3-Clause