From 1cf8d32e6409cd7e8b5f4f82aefe6a4fb3a37b52 Mon Sep 17 00:00:00 2001 From: Michal Pristas Date: Thu, 4 Jul 2024 16:37:39 +0200 Subject: [PATCH 1/2] updated es infra processor and dependabot rules to include further updates --- .github/dependabot.yml | 1 + NOTICE.txt | 8 ++++---- go.mod | 4 ++-- go.sum | 8 ++++---- internal/pkg/otel/README.md | 2 +- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a309f5c8b47..d0e3a7b7a63 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -21,6 +21,7 @@ updates: - dependency-name: "github.com/elastic/*" - dependency-name: "go.opentelemetry.io/collector/*" - dependency-name: "github.com/open-telemetry/opentelemetry-collector-contrib/*" + - dependency-name: "github.com/elastic/opentelemetry-collector-components/*" reviewers: - "elastic/elastic-agent-control-plane" open-pull-requests-limit: 10 diff --git a/NOTICE.txt b/NOTICE.txt index e6f269d771b..b710ceb23e8 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -2670,11 +2670,11 @@ limitations under the License. -------------------------------------------------------------------------------- Dependency : github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor -Version: v0.4.0 +Version: v0.5.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor@v0.4.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor@v0.5.0/LICENSE: Apache License Version 2.0, January 2004 @@ -20091,11 +20091,11 @@ limitations under the License. -------------------------------------------------------------------------------- Dependency : github.com/elastic/opentelemetry-lib -Version: v0.5.0 +Version: v0.6.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-lib@v0.5.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-lib@v0.6.0/LICENSE: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index 5fe8ad63937..d145d0c49ff 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/elastic/go-sysinfo v1.14.0 github.com/elastic/go-ucfg v0.8.8 github.com/elastic/mock-es v0.0.0-20240605193845-b5546a703d6f - github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.4.0 + github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.5.0 github.com/fatih/color v1.16.0 github.com/fsnotify/fsnotify v1.7.0 github.com/gofrs/flock v0.8.1 @@ -148,7 +148,7 @@ require ( github.com/elastic/go-structform v0.0.10 // indirect github.com/elastic/go-windows v1.0.1 // indirect github.com/elastic/gosigar v0.14.3 // indirect - github.com/elastic/opentelemetry-lib v0.5.0 // indirect + github.com/elastic/opentelemetry-lib v0.6.0 // indirect github.com/elastic/pkcs8 v1.0.0 // indirect github.com/emicklei/go-restful/v3 v3.11.0 // indirect github.com/evanphx/json-patch v5.6.0+incompatible // indirect diff --git a/go.sum b/go.sum index 2cb04b9bf32..4756539f2c4 100644 --- a/go.sum +++ b/go.sum @@ -851,10 +851,10 @@ github.com/elastic/gosigar v0.14.3 h1:xwkKwPia+hSfg9GqrCUKYdId102m9qTJIIr7egmK/u github.com/elastic/gosigar v0.14.3/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs= github.com/elastic/mock-es v0.0.0-20240605193845-b5546a703d6f h1:qo0Nn9G+p7HbG+CmiWwSoiKJ/cyRq59TRn9Z2PRHTi8= github.com/elastic/mock-es v0.0.0-20240605193845-b5546a703d6f/go.mod h1:mVdKBYYwt30xRFjCegbcURHh+3LWOCkQM33fgWbUiRI= -github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.4.0 h1:jSq7qvh39GCpv0XF7/hys2mJmQaATKkCNVj/SY5S730= -github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.4.0/go.mod h1:cbFtO2rPm7o2kAZKwH/SQ7QZVGYt2qdqHjWOw5TTsYg= -github.com/elastic/opentelemetry-lib v0.5.0 h1:BT1Koon6lm0zF554NuPtachBBR+26RS9GlCaaMbGIJ8= -github.com/elastic/opentelemetry-lib v0.5.0/go.mod h1:/kKvHbJLVo/NcKMPHI8/RZKL64fushmnRUzn+arQpjg= +github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.5.0 h1:f+ekGMdeJSgg57nU691JHeHhY+MXWOIfT+TZndshMsg= +github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.5.0/go.mod h1:oFZ5DWm1LlimtOLrAji9yKVMQsNdlub6vOg+f1IM6WI= +github.com/elastic/opentelemetry-lib v0.6.0 h1:zNhbh1M6WOZUQ7GJsyWdaDtz6ElfbI6v+/M6VoWQ0sg= +github.com/elastic/opentelemetry-lib v0.6.0/go.mod h1:/kKvHbJLVo/NcKMPHI8/RZKL64fushmnRUzn+arQpjg= github.com/elastic/package-spec/v2 v2.6.0/go.mod h1:ks9/FaVOS+vCrGRQcDvXAd2FlmB84mrLikbRiO6ACuk= github.com/elastic/pkcs8 v1.0.0 h1:HhitlUKxhN288kcNcYkjW6/ouvuwJWd9ioxpjnD9jVA= github.com/elastic/pkcs8 v1.0.0/go.mod h1:ipsZToJfq1MxclVTwpG7U/bgeDtf+0HkUiOxebk95+0= diff --git a/internal/pkg/otel/README.md b/internal/pkg/otel/README.md index 27f8acf6304..8a1c00874d6 100644 --- a/internal/pkg/otel/README.md +++ b/internal/pkg/otel/README.md @@ -58,7 +58,7 @@ This section provides a summary of components included in the Elastic Distributi | Component | Version | |---|---| -| elasticinframetricsprocessor | v0.4.0| +| elasticinframetricsprocessor | v0.5.0| | attributesprocessor | v0.104.0| | filterprocessor | v0.104.0| | k8sattributesprocessor | v0.104.0| From 40b44ff197004b7e6bf08a6c86de2c11a870855d Mon Sep 17 00:00:00 2001 From: Michal Pristas Date: Thu, 4 Jul 2024 16:41:46 +0200 Subject: [PATCH 2/2] updated es infra processor and dependabot rules to include further updates --- NOTICE.txt | 8 ++++---- go.mod | 4 ++-- go.sum | 8 ++++---- internal/pkg/otel/README.md | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index b710ceb23e8..79716ddd3c0 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -2670,11 +2670,11 @@ limitations under the License. -------------------------------------------------------------------------------- Dependency : github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor -Version: v0.5.0 +Version: v0.5.1 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor@v0.5.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor@v0.5.1/LICENSE: Apache License Version 2.0, January 2004 @@ -20091,11 +20091,11 @@ limitations under the License. -------------------------------------------------------------------------------- Dependency : github.com/elastic/opentelemetry-lib -Version: v0.6.0 +Version: v0.6.1 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-lib@v0.6.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-lib@v0.6.1/LICENSE: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index d145d0c49ff..b742c610c39 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/elastic/go-sysinfo v1.14.0 github.com/elastic/go-ucfg v0.8.8 github.com/elastic/mock-es v0.0.0-20240605193845-b5546a703d6f - github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.5.0 + github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.5.1 github.com/fatih/color v1.16.0 github.com/fsnotify/fsnotify v1.7.0 github.com/gofrs/flock v0.8.1 @@ -148,7 +148,7 @@ require ( github.com/elastic/go-structform v0.0.10 // indirect github.com/elastic/go-windows v1.0.1 // indirect github.com/elastic/gosigar v0.14.3 // indirect - github.com/elastic/opentelemetry-lib v0.6.0 // indirect + github.com/elastic/opentelemetry-lib v0.6.1 // indirect github.com/elastic/pkcs8 v1.0.0 // indirect github.com/emicklei/go-restful/v3 v3.11.0 // indirect github.com/evanphx/json-patch v5.6.0+incompatible // indirect diff --git a/go.sum b/go.sum index 4756539f2c4..ac4f9a7c2a3 100644 --- a/go.sum +++ b/go.sum @@ -851,10 +851,10 @@ github.com/elastic/gosigar v0.14.3 h1:xwkKwPia+hSfg9GqrCUKYdId102m9qTJIIr7egmK/u github.com/elastic/gosigar v0.14.3/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs= github.com/elastic/mock-es v0.0.0-20240605193845-b5546a703d6f h1:qo0Nn9G+p7HbG+CmiWwSoiKJ/cyRq59TRn9Z2PRHTi8= github.com/elastic/mock-es v0.0.0-20240605193845-b5546a703d6f/go.mod h1:mVdKBYYwt30xRFjCegbcURHh+3LWOCkQM33fgWbUiRI= -github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.5.0 h1:f+ekGMdeJSgg57nU691JHeHhY+MXWOIfT+TZndshMsg= -github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.5.0/go.mod h1:oFZ5DWm1LlimtOLrAji9yKVMQsNdlub6vOg+f1IM6WI= -github.com/elastic/opentelemetry-lib v0.6.0 h1:zNhbh1M6WOZUQ7GJsyWdaDtz6ElfbI6v+/M6VoWQ0sg= -github.com/elastic/opentelemetry-lib v0.6.0/go.mod h1:/kKvHbJLVo/NcKMPHI8/RZKL64fushmnRUzn+arQpjg= +github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.5.1 h1:DtRPj288iHCZPjBUfxhgHS8SWM1p2TtBadbHjZBpZck= +github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.5.1/go.mod h1:/eTf2omfsfYQOw+nGK2NzByPMNmwq2xBFmcnREOQMBI= +github.com/elastic/opentelemetry-lib v0.6.1 h1:Ayx82UH+oXF2222wmKTcRcq0todI6btpd8KF1tz1ZQ8= +github.com/elastic/opentelemetry-lib v0.6.1/go.mod h1:/kKvHbJLVo/NcKMPHI8/RZKL64fushmnRUzn+arQpjg= github.com/elastic/package-spec/v2 v2.6.0/go.mod h1:ks9/FaVOS+vCrGRQcDvXAd2FlmB84mrLikbRiO6ACuk= github.com/elastic/pkcs8 v1.0.0 h1:HhitlUKxhN288kcNcYkjW6/ouvuwJWd9ioxpjnD9jVA= github.com/elastic/pkcs8 v1.0.0/go.mod h1:ipsZToJfq1MxclVTwpG7U/bgeDtf+0HkUiOxebk95+0= diff --git a/internal/pkg/otel/README.md b/internal/pkg/otel/README.md index 8a1c00874d6..419e6dc0fb7 100644 --- a/internal/pkg/otel/README.md +++ b/internal/pkg/otel/README.md @@ -58,7 +58,7 @@ This section provides a summary of components included in the Elastic Distributi | Component | Version | |---|---| -| elasticinframetricsprocessor | v0.5.0| +| elasticinframetricsprocessor | v0.5.1| | attributesprocessor | v0.104.0| | filterprocessor | v0.104.0| | k8sattributesprocessor | v0.104.0|