From 026e3f5944b753aab67fe071487f00595b251b9c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 17:28:48 -0700 Subject: [PATCH 1/5] Bump github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor from 0.3.0 to 0.4.0 (#5043) * Bump github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor Bumps [github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor](https://github.com/elastic/opentelemetry-collector-components) from 0.3.0 to 0.4.0. - [Release notes](https://github.com/elastic/opentelemetry-collector-components/releases) - [Commits](https://github.com/elastic/opentelemetry-collector-components/compare/processor/elasticinframetricsprocessor/v0.3.0...processor/elasticinframetricsprocessor/v0.4.0) --- updated-dependencies: - dependency-name: github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Update NOTICE.txt * Update otel README.md --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] --- 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 d2403d56652..fdffaa853b1 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.3.0 +Version: v0.4.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor@v0.3.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor@v0.4.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.4.0 +Version: v0.5.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-lib@v0.4.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-lib@v0.5.0/LICENSE: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index 954ab596bff..209226f56c2 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.3.0 + github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.4.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.4.0 // indirect + github.com/elastic/opentelemetry-lib v0.5.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 c6bf91a5b39..872fb2a3b73 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.3.0 h1:iZrOpSv4X7QIOttTYmfJ73JTlqXa5XxgCXUXw9GEfwM= -github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.3.0/go.mod h1:Z3Bgi98f9RhBNwlaT0ZLSbXQLzaNELyTJREV+v+2KgE= -github.com/elastic/opentelemetry-lib v0.4.0 h1:e+N00oKXnv8EIXDVjHXPjkxox98JVm1b4kHVMp1NcTA= -github.com/elastic/opentelemetry-lib v0.4.0/go.mod h1:/kKvHbJLVo/NcKMPHI8/RZKL64fushmnRUzn+arQpjg= +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/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 22c7cdaac74..71cdf87866b 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.3.0| +| elasticinframetricsprocessor | v0.4.0| | attributesprocessor | v0.103.0| | filterprocessor | v0.103.0| | k8sattributesprocessor | v0.103.0| From 11cca4b5fbc0f37eb7e5eb3fb46912b9d3f3c0ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2024 09:31:01 +0000 Subject: [PATCH 2/5] Bump the otel-dependencies group with 28 updates (#5041) * Bump the otel-dependencies group with 28 updates Bumps the otel-dependencies group with 28 updates: | Package | From | To | | --- | --- | --- | | [github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector](https://github.com/open-telemetry/opentelemetry-collector-contrib) | `0.103.0` | `0.104.0` | | [github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib) | `0.103.1-0.20240701121317-74244e46a6b6` | `0.104.0` | | [github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib) | `0.103.0` | `0.104.0` | | [github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage](https://github.com/open-telemetry/opentelemetry-collector-contrib) | `0.103.0` | `0.104.0` | | [github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib) | `0.103.0` | `0.104.0` | | [github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib) | `0.103.0` | `0.104.0` | | [github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib) | `0.103.0` | `0.104.0` | | [github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib) | `0.103.0` | `0.104.0` | | [github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib) | `0.103.0` | `0.104.0` | | [github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib) | `0.103.0` | `0.104.0` | | [github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib) | `0.103.0` | `0.104.0` | | [github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib) | `0.103.0` | `0.104.0` | | [github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib) | `0.103.0` | `0.104.0` | | [github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib) | `0.103.0` | `0.104.0` | | [github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib) | `0.103.0` | `0.104.0` | | [github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil](https://github.com/open-telemetry/opentelemetry-collector-contrib) | `0.103.0` | `0.104.0` | | [github.com/open-telemetry/opentelemetry-collector-contrib/internal/common](https://github.com/open-telemetry/opentelemetry-collector-contrib) | `0.103.0` | `0.104.0` | | [github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal](https://github.com/open-telemetry/opentelemetry-collector-contrib) | `0.103.0` | `0.104.0` | | [github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter](https://github.com/open-telemetry/opentelemetry-collector-contrib) | `0.103.0` | `0.104.0` | | [github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig](https://github.com/open-telemetry/opentelemetry-collector-contrib) | `0.103.0` | `0.104.0` | | [github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet](https://github.com/open-telemetry/opentelemetry-collector-contrib) | `0.103.0` | `0.104.0` | | [github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders](https://github.com/open-telemetry/opentelemetry-collector-contrib) | `0.103.0` | `0.104.0` | | [github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil](https://github.com/open-telemetry/opentelemetry-collector-contrib) | `0.103.0` | `0.104.0` | | [github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent](https://github.com/open-telemetry/opentelemetry-collector-contrib) | `0.103.0` | `0.104.0` | | [github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata](https://github.com/open-telemetry/opentelemetry-collector-contrib) | `0.103.0` | `0.104.0` | | [github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl](https://github.com/open-telemetry/opentelemetry-collector-contrib) | `0.103.0` | `0.104.0` | | [github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil](https://github.com/open-telemetry/opentelemetry-collector-contrib) | `0.103.0` | `0.104.0` | | [github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza](https://github.com/open-telemetry/opentelemetry-collector-contrib) | `0.103.0` | `0.104.0` | Updates `github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector` from 0.103.0 to 0.104.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.103.0...v0.104.0) Updates `github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter` from 0.103.1-0.20240701121317-74244e46a6b6 to 0.104.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/commits/v0.104.0) Updates `github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter` from 0.103.0 to 0.104.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.103.0...v0.104.0) Updates `github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage` from 0.103.0 to 0.104.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.103.0...v0.104.0) Updates `github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor` from 0.103.0 to 0.104.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.103.0...v0.104.0) Updates `github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor` from 0.103.0 to 0.104.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.103.0...v0.104.0) Updates `github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor` from 0.103.0 to 0.104.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.103.0...v0.104.0) Updates `github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor` from 0.103.0 to 0.104.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.103.0...v0.104.0) Updates `github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor` from 0.103.0 to 0.104.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.103.0...v0.104.0) Updates `github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor` from 0.103.0 to 0.104.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.103.0...v0.104.0) Updates `github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver` from 0.103.0 to 0.104.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.103.0...v0.104.0) Updates `github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver` from 0.103.0 to 0.104.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.103.0...v0.104.0) Updates `github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver` from 0.103.0 to 0.104.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.103.0...v0.104.0) Updates `github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver` from 0.103.0 to 0.104.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.103.0...v0.104.0) Updates `github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver` from 0.103.0 to 0.104.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.103.0...v0.104.0) Updates `github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil` from 0.103.0 to 0.104.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.103.0...v0.104.0) Updates `github.com/open-telemetry/opentelemetry-collector-contrib/internal/common` from 0.103.0 to 0.104.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.103.0...v0.104.0) Updates `github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal` from 0.103.0 to 0.104.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.103.0...v0.104.0) Updates `github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter` from 0.103.0 to 0.104.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.103.0...v0.104.0) Updates `github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig` from 0.103.0 to 0.104.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.103.0...v0.104.0) Updates `github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet` from 0.103.0 to 0.104.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.103.0...v0.104.0) Updates `github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders` from 0.103.0 to 0.104.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.103.0...v0.104.0) Updates `github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil` from 0.103.0 to 0.104.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.103.0...v0.104.0) Updates `github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent` from 0.103.0 to 0.104.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.103.0...v0.104.0) Updates `github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata` from 0.103.0 to 0.104.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.103.0...v0.104.0) Updates `github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl` from 0.103.0 to 0.104.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.103.0...v0.104.0) Updates `github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil` from 0.103.0 to 0.104.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.103.0...v0.104.0) Updates `github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza` from 0.103.0 to 0.104.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.103.0...v0.104.0) --- updated-dependencies: - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel-dependencies - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel-dependencies - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel-dependencies - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel-dependencies - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel-dependencies - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel-dependencies - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel-dependencies - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel-dependencies - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel-dependencies - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel-dependencies - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel-dependencies - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel-dependencies - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel-dependencies - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel-dependencies - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel-dependencies - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil dependency-type: indirect update-type: version-update:semver-minor dependency-group: otel-dependencies - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/internal/common dependency-type: indirect update-type: version-update:semver-minor dependency-group: otel-dependencies - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal dependency-type: indirect update-type: version-update:semver-minor dependency-group: otel-dependencies - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter dependency-type: indirect update-type: version-update:semver-minor dependency-group: otel-dependencies - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig dependency-type: indirect update-type: version-update:semver-minor dependency-group: otel-dependencies - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet dependency-type: indirect update-type: version-update:semver-minor dependency-group: otel-dependencies - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders dependency-type: indirect update-type: version-update:semver-minor dependency-group: otel-dependencies - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil dependency-type: indirect update-type: version-update:semver-minor dependency-group: otel-dependencies - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent dependency-type: indirect update-type: version-update:semver-minor dependency-group: otel-dependencies - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata dependency-type: indirect update-type: version-update:semver-minor dependency-group: otel-dependencies - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl dependency-type: indirect update-type: version-update:semver-minor dependency-group: otel-dependencies - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil dependency-type: indirect update-type: version-update:semver-minor dependency-group: otel-dependencies - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza dependency-type: indirect update-type: version-update:semver-minor dependency-group: otel-dependencies ... Signed-off-by: dependabot[bot] * Update NOTICE.txt * Update otel README.md --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] --- NOTICE.txt | 300 +++++++++++++++++++++++------------- go.mod | 66 ++++---- go.sum | 153 +++++++++--------- internal/pkg/otel/README.md | 30 ++-- 4 files changed, 325 insertions(+), 224 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index fdffaa853b1..e6f269d771b 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -4895,11 +4895,11 @@ Contents of probable licence file $GOMODCACHE/github.com/oklog/ulid@v1.3.1/LICEN -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -5106,11 +5106,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter -Version: v0.103.1-0.20240701121317-74244e46a6b6 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter@v0.103.1-0.20240701121317-74244e46a6b6/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -5317,11 +5317,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -5528,11 +5528,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -5739,11 +5739,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -5950,11 +5950,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -6161,11 +6161,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -6372,11 +6372,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -6583,11 +6583,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -6794,11 +6794,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -7005,11 +7005,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -7216,11 +7216,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -7427,11 +7427,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -7638,11 +7638,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -7849,11 +7849,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -17020,11 +17020,11 @@ Contents of probable licence file $GOMODCACHE/github.com/!flaque/filet@v0.0.0-20 -------------------------------------------------------------------------------- Dependency : github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp -Version: v1.23.0 +Version: v1.24.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/!google!cloud!platform/opentelemetry-operations-go/detectors/gcp@v1.23.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/!google!cloud!platform/opentelemetry-operations-go/detectors/gcp@v1.24.0/LICENSE: Apache License @@ -20516,6 +20516,69 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +-------------------------------------------------------------------------------- +Dependency : github.com/go-kit/log +Version: v0.2.1 +Licence type (autodetected): MIT +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/github.com/go-kit/log@v0.2.1/LICENSE: + +MIT License + +Copyright (c) 2021 Go kit + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + + +-------------------------------------------------------------------------------- +Dependency : github.com/go-logfmt/logfmt +Version: v0.5.1 +Licence type (autodetected): MIT +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/github.com/go-logfmt/logfmt@v0.5.1/LICENSE: + +The MIT License (MIT) + +Copyright (c) 2015 go-logfmt + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + + + -------------------------------------------------------------------------------- Dependency : github.com/go-logr/logr Version: v1.4.2 @@ -20940,11 +21003,11 @@ Contents of probable licence file $GOMODCACHE/github.com/go-logr/stdr@v1.2.2/LIC -------------------------------------------------------------------------------- Dependency : github.com/go-ole/go-ole -Version: v1.2.6 +Version: v1.3.0 Licence type (autodetected): MIT -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/go-ole/go-ole@v1.2.6/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/go-ole/go-ole@v1.3.0/LICENSE: The MIT License (MIT) @@ -21726,6 +21789,37 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +-------------------------------------------------------------------------------- +Dependency : github.com/goccy/go-json +Version: v0.10.3 +Licence type (autodetected): MIT +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/github.com/goccy/go-json@v0.10.3/LICENSE: + +MIT License + +Copyright (c) 2020 Masaaki Goshima + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + + -------------------------------------------------------------------------------- Dependency : github.com/gogo/protobuf Version: v1.3.2 @@ -30019,37 +30113,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --------------------------------------------------------------------------------- -Dependency : github.com/leoluk/perflib_exporter -Version: v0.2.1 -Licence type (autodetected): MIT --------------------------------------------------------------------------------- - -Contents of probable licence file $GOMODCACHE/github.com/leoluk/perflib_exporter@v0.2.1/LICENSE: - -The MIT License (MIT) - -Copyright (c) 2018 Leopold Schabel / The perflib_exporter authors - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - - -------------------------------------------------------------------------------- Dependency : github.com/lestrrat-go/envload Version: v0.0.0-20180220234015-a3eb8ddeffcc @@ -32604,11 +32667,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -32815,11 +32878,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -33026,11 +33089,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -33237,11 +33300,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -33448,11 +33511,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/internal/common -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/common@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/common@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -33659,11 +33722,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -33870,11 +33933,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -34081,11 +34144,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -34292,11 +34355,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -34503,11 +34566,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -34714,11 +34777,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -34925,11 +34988,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -35136,11 +35199,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -35347,11 +35410,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -35558,11 +35621,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -35769,11 +35832,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -35980,11 +36043,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -36191,11 +36254,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -36402,11 +36465,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza -Version: v0.103.0 +Version: v0.104.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza@v0.103.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza@v0.104.0/LICENSE: Apache License Version 2.0, January 2004 @@ -37528,6 +37591,37 @@ SOFTWARE. +-------------------------------------------------------------------------------- +Dependency : github.com/prometheus-community/windows_exporter +Version: v0.25.1 +Licence type (autodetected): MIT +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/github.com/prometheus-community/windows_exporter@v0.25.1/LICENSE: + +The MIT License (MIT) + +Copyright (c) 2016 Martin Lindhe + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + + -------------------------------------------------------------------------------- Dependency : github.com/prometheus/client_golang Version: v1.19.1 diff --git a/go.mod b/go.mod index 209226f56c2..5fe8ad63937 100644 --- a/go.mod +++ b/go.mod @@ -86,21 +86,21 @@ require ( require ( github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e // indirect github.com/distribution/reference v0.5.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.103.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.103.1-0.20240701121317-74244e46a6b6 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.103.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.103.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.103.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.103.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.103.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.103.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.103.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.103.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.103.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.103.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver v0.103.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.103.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.103.0 + github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.104.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.104.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.104.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.104.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.104.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.104.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.104.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.104.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.104.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.104.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.104.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.104.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver v0.104.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.104.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.104.0 go.opentelemetry.io/collector/component v0.104.0 go.opentelemetry.io/collector/confmap v0.104.0 go.opentelemetry.io/collector/confmap/converter/expandconverter v0.104.0 @@ -126,7 +126,7 @@ require ( require ( cloud.google.com/go/compute/metadata v0.3.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.23.0 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.0 // indirect github.com/Jeffail/gabs/v2 v2.6.0 // indirect github.com/Showmax/go-fqdn v1.0.0 // indirect github.com/StackExchange/wmi v1.2.1 // indirect @@ -155,15 +155,18 @@ require ( github.com/expr-lang/expr v1.16.9 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/ghodss/yaml v1.0.0 // indirect + github.com/go-kit/log v0.2.1 // indirect + github.com/go-logfmt/logfmt v0.5.1 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/go-ole/go-ole v1.2.6 // indirect + github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.22.3 // indirect github.com/go-viper/mapstructure/v2 v2.0.0 // indirect github.com/gobuffalo/here v0.6.0 // indirect github.com/gobwas/glob v0.2.3 // indirect + github.com/goccy/go-json v0.10.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.4 // indirect @@ -196,7 +199,6 @@ require ( github.com/knadh/koanf/v2 v2.1.1 // indirect github.com/leodido/go-syslog/v4 v4.1.0 // indirect github.com/leodido/ragel-machinery v0.0.0-20190525184631-5f46317e436b // indirect - github.com/leoluk/perflib_exporter v0.2.1 // indirect github.com/lestrrat-go/strftime v1.0.6 // indirect github.com/lightstep/go-expohisto v1.0.0 // indirect github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect @@ -217,25 +219,26 @@ require ( github.com/mostynb/go-grpc-compression v1.2.3 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.103.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.103.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.103.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.103.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.103.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.103.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.103.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.103.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.103.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.103.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.103.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.103.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.103.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.104.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.104.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.104.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.104.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.104.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.104.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.104.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.104.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.104.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.104.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.104.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.104.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.104.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0 // indirect github.com/openshift/api v3.9.0+incompatible // indirect github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect + github.com/prometheus-community/windows_exporter v0.25.1 // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.54.0 // indirect @@ -273,7 +276,6 @@ require ( go.opentelemetry.io/collector/consumer v0.104.0 // indirect go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect go.opentelemetry.io/collector/filter v0.104.0 // indirect - go.opentelemetry.io/collector/otelcol/otelcoltest v0.104.0 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/collector/semconv v0.104.0 // indirect go.opentelemetry.io/collector/service v0.104.0 // indirect diff --git a/go.sum b/go.sum index 872fb2a3b73..2cb04b9bf32 100644 --- a/go.sum +++ b/go.sum @@ -423,8 +423,8 @@ github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/Flaque/filet v0.0.0-20201012163910-45f684403088 h1:PnnQln5IGbhLeJOi6hVs+lCeF+B1dRfFKPGXUAez0Ww= github.com/Flaque/filet v0.0.0-20201012163910-45f684403088/go.mod h1:TK+jB3mBs+8ZMWhU5BqZKnZWJ1MrLo8etNVg51ueTBo= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.23.0 h1:yRhWveg9NbJcJYoJL4FoSauT2dxnt4N9MIAJ7tvU/mQ= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.23.0/go.mod h1:p2puVVSKjQ84Qb1gzw2XHLs34WQyHTYFZLaVxypAFYs= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.0 h1:N4xzkSD2BkRwEZSPf3C2eUZxjS5trpo4gOwRh8mu+BA= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.0/go.mod h1:p2puVVSKjQ84Qb1gzw2XHLs34WQyHTYFZLaVxypAFYs= github.com/Jeffail/gabs/v2 v2.6.0 h1:WdCnGaDhNa4LSRTMwhLZzJ7SRDXjABNP13SOKvCpL5w= github.com/Jeffail/gabs/v2 v2.6.0/go.mod h1:xCn81vdHKxFUuWWAaD5jCTQDNPBMh5pPs9IJ+NcziBI= github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= @@ -938,9 +938,12 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= +github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= +github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA= github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= @@ -957,8 +960,9 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-logr/zapr v1.2.3/go.mod h1:eIauM6P8qSvTw5o2ez6UEAfGjQKrxQTl5EoK+Qa2oG4= github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= -github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= +github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= github.com/go-openapi/errors v0.20.2/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= github.com/go-openapi/errors v0.20.3/go.mod h1:Z3FlZ4I8jEGxjUK+bugx3on2mIAk4txuAOhlsB1FSgk= github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= @@ -999,6 +1003,8 @@ github.com/gobuffalo/packd v1.0.1/go.mod h1:PP2POP3p3RXGz7Jh6eYEf93S7vA2za6xM7QT github.com/gobuffalo/packr/v2 v2.8.3/go.mod h1:0SahksCVcx4IMnigTjiFuyldmTrdTctXsOdiU5KwbKc= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= +github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= +github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= @@ -1381,8 +1387,6 @@ github.com/leodido/go-syslog/v4 v4.1.0 h1:Wsl194qyWXr7V6DrGWC3xmxA9Ra6XgWO+toNt2 github.com/leodido/go-syslog/v4 v4.1.0/go.mod h1:eJ8rUfDN5OS6dOkCOBYlg2a+hbAg6pJa99QXXgMrd98= github.com/leodido/ragel-machinery v0.0.0-20190525184631-5f46317e436b h1:11UHH39z1RhZ5dc4y4r/4koJo6IYFgTRMe/LlwRTEw0= github.com/leodido/ragel-machinery v0.0.0-20190525184631-5f46317e436b/go.mod h1:WZxr2/6a/Ar9bMDc2rN/LJrE/hF6bXE4LPyDSIxwAfg= -github.com/leoluk/perflib_exporter v0.2.1 h1:/3/ut1k/jFt5p4ypjLZKDHDqlXAK6ERZPVWtwdI389I= -github.com/leoluk/perflib_exporter v0.2.1/go.mod h1:MinSWm88jguXFFrGsP56PtleUb4Qtm4tNRH/wXNXRTI= github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc h1:RKf14vYWi2ttpEmkA4aQ3j4u9dStX2t4M8UM6qqNsG8= github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc/go.mod h1:kopuH9ugFRkIXf3YoqHKyrJ9YfUFsckUU9S7B+XP+is= github.com/lestrrat-go/strftime v1.0.6 h1:CFGsDEt1pOpFNU+TJB0nhz9jl+K0hZSLE205AhTIGQQ= @@ -1598,74 +1602,74 @@ github.com/onsi/gomega v1.22.1/go.mod h1:x6n7VNe4hw0vkyYUM4mjIXx3JbLiPaBPNgB7PRQ github.com/onsi/gomega v1.23.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2vQAg= github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg= github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= -github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.103.0 h1:th1Swa6AOTpbr8Yui5/LLQjIwUZhV4wcbfvusKL9qSk= -github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.103.0/go.mod h1:5bCbYY4xRBBIwzUOdBcezz6iff7+LtPNZBYYxk+cFro= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.103.1-0.20240701121317-74244e46a6b6 h1:ujuVAs7YT70qPgaY6kiDLTYC70Aak1GRQmX4xkQn0t8= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.103.1-0.20240701121317-74244e46a6b6/go.mod h1:YQ8t44O5TFRhp757MTgcio26y+ncEG8oXeNq9bFyUcg= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.103.0 h1:wC4nWmlXsM7FQseO73Ic+8MftJV7NRtqPjFY475Jo90= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.103.0/go.mod h1:rgaRhVR8qqSHK7UnFt055kY29QJzexZdg7YG5nJrHLQ= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.103.0 h1:ul4wxL7d8FH5qkdqvA8whNOEmK4/VH0/uXbgrFFHwHs= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.103.0/go.mod h1:aand41EuSgmlWvOM6Auw7SB75gvG3MffehUPMJ3kq2s= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension v0.103.0 h1:ikR6Xz7QNQjJmaSGeIJbWGceBgzvkqhqXD08DihBHvI= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension v0.103.0/go.mod h1:AHFl/jNm5QPflc133yapl17l177ut2/MIAS2Zft5M3A= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.103.0 h1:txNSkgEEmDyrasuGO9egQ+58i+7P/mJKdHmSHg0sO4c= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.103.0/go.mod h1:XtRqfouM/9owDyCIi2TksmSc1sfLGmLRiFhyQ7KFS6w= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.103.0 h1:iEreRkHc4UI6cKeTMqFKhCusa7q8BnmJcHFNmJFaBwk= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.103.0/go.mod h1:piJxxco+5cKjsAEWv5hh9YLK4FZbajXXNW5hTxptEL4= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.103.0 h1:hdSxvwF/v3XJMWvYGlBrhewIW5zsbNLmwHeEJdTBJuU= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.103.0/go.mod h1:oGXp5qTdFmHgnm+J8v9wyjRAozZg11M8puiOZa0d+W8= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.103.0 h1:olbjLOuCgVCiRNzdg0I9Lv7VuUHFbEuqP31fdriyqi0= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.103.0/go.mod h1:2Zksmb1fF+4ksNsOxSVrHz5IoC/2ljvtqJGzy7qe8+E= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.103.0 h1:xtU09wCMSp/VazMC4qjP69LnuUUNDj6aGNG/jmSZXTM= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.103.0/go.mod h1:arqw5KwD4HBC3PZeqsLqMWPmnkaOcrrW5bMndHwNyO4= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.103.0 h1:HIhw3poxC0r5NyOOvO5m+yCnXWBaOvRfkq3XGs+Ag58= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.103.0/go.mod h1:5Y5wUGq+NNIgvkj3qNSsS3QJx3KiU4DfUFbMrlMlPsQ= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.103.0 h1:MZuxGGLUIMbErgwUeT9yqFXrsMYveGoPjck9OxHtT0A= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.103.0/go.mod h1:VS66oUydCMwiWl1BFmLs7iNy4lGsfVYsriXr/d1fpAk= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest v0.103.0 h1:vSHoHLveqT9NULaIdIbfPgEvJ0e+UkBitb3dnawmunc= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest v0.103.0/go.mod h1:hCzgpzXbUUDUlETMDKYOpPaOhPjR9T6M3W3nAW5cGX4= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.103.0 h1:wutEqxE5r67s+aW48pwGEKdrqE4ODtcN4SOQraEQpsc= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.103.0/go.mod h1:Ah/qqOaRXhujNMfPkNd5zlLkyagp5UTVGytGDOIULIE= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.103.0 h1:Q5b1ZIjQf5EGKAQSJa6XfHWt/TDaNs+qldqdpYK+ovo= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.103.0/go.mod h1:VDyjNiPEI3G3IJ7CwxU6zCTErB7KovQh6l51eePAPWc= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.103.0 h1:5PHQ2a5VsqXDZBmso84fLDzT66GV0mqDT5JCB07W8Ws= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.103.0/go.mod h1:oU1oils/dQVq3E3h7e3afFEXfCSmwniEK/NlEByaJWY= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.103.0 h1:j53/hdxxE6qphxI7S4ybo22/mT/0kDktWLgdwV5pB/Y= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.103.0/go.mod h1:3GFvGay9sySyHLAFlkkV1N+fUNvHz5LcN8/gPFBzEYw= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.103.0 h1:5m52scH/ZNPGhTL37BcJBIIU8vhzl6VHUUe1zHynic8= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.103.0/go.mod h1:gVTEVRs+N0ItJYfmeyBDjH+CT43DJVElVmsE7ac+myQ= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.103.0 h1:GMx3/P287NuWOJH22eLCtaJ1ATW8BoOZL6GjINUAVYI= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.103.0/go.mod h1:xGM9aD/2Dww/WKg5ei7a43TRSWuVwgMO9NPjPbgtmT8= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.103.0 h1:angDCU0CPBLu2fAi7r7yCEWxRKthhNnYnMugdiULmvw= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.103.0/go.mod h1:N80rYgsjtq+G/DJQVCLCkxmpCIA/mnQTRUJxa8mMNsw= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.103.0 h1:XYkQCe4UPFy7qmBs1zhknhe1wzPnAff4Rb4WtnD8aAQ= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.103.0/go.mod h1:hmeKPJaZjzOjcndDxpWnjt0781EMqvj3or01baNVoRI= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.103.0 h1:1cZyMMLSpSWFdfITyVc9Bb+8rn175/GGwtWZQ3nClpc= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.103.0/go.mod h1:o8BPP4DM2SkdkPJxJOdmgxKz5DftGcuyUXgqf5MoWAw= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.103.0 h1:1A4uUWQlV7K4ei0GDHFSU0wWH1qH+W0AOchbodjCDHs= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.103.0/go.mod h1:Pg/6+QdHzFVuyTrCzXv8J8S4L6/H41sbRLcpoPQo4dE= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.103.0 h1:c5sOZWBMD/gyKxqwGgS6cwLdvkg6W8I3/0RZOm84xA0= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.103.0/go.mod h1:2CG+06d3sh+O36maAs2TPAbNRXZ0zcqY2kH5pEABrzg= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.103.0 h1:u2ZcBCuOXpD7FIm+LZrhEMhi/Ny/mhivAfuCUpPzrUg= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.103.0/go.mod h1:9n3OvWN10XXyg+o71jeuO94u8mEWOI90Vg8y3M7zpE0= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.103.0 h1:v19lfgrsflmimm0LGOZoB51eNO0305Yud6LCnhS7LPY= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.103.0/go.mod h1:Z8OvUd7UJJpyXT2O5ma8QT42NfkP/7Q0l1oxStJ/5MY= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.103.0 h1:0RKHdlCbOQA09p8BmtCjJqaYsu20bNVi6zWrpdgxxYw= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.103.0/go.mod h1:H1z0xcIHlvTlISLtrZlRF4nwDrGLu/iO2ExXacYcJM4= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.103.0 h1:Gg2j3yN2iCQYwK+464RyVvmX+QyjjdXL3JpG+6BfDAQ= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.103.0/go.mod h1:4nxV+BIA4LLyjhFeuUuLlY7iza+PyySjKz4PfL44SRQ= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.103.0 h1:+JRtnmcLjvG0BESXWCQ9PECtTisWtnIT1/DutAdr38U= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.103.0/go.mod h1:0mYHrHaJZiWfEcYxJCMTs7AlXmnIsC3cDNbSq5e255Q= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.103.0 h1:QUsI2cTLs4CLk/TBll1llkzzchmqr2TRANdgMy0Nz/k= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.103.0/go.mod h1:cdJpaBiLfV16LteiKj8iP7snJ6alJy1dVa7FTcC915c= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.103.0 h1:8HZm7c/QOvrLdj3bZjoBaL1YqRme6/x3gCKJvvF6uMU= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.103.0/go.mod h1:saj0LAF7PbWIYnNjYjuM5UXjLiTnOug5r731oLkQv6Q= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver v0.103.0 h1:UnhfOFVZdN1344pT0yfTcRZwKOBlgdUz5iBLN66GgyU= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver v0.103.0/go.mod h1:928SKR44tAnAG5KfDzfY6waRRohMsgFj29TC4wdR04E= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.103.0 h1:7W4crd2OcXyZatXUgV0diOIKAdYBdmbwrvTw45UkDfA= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.103.0/go.mod h1:dY3HXexyi150ycmfpH2ymMnWagsJy2rVF4Y9nZXPLkI= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.103.0 h1:HOJ27FvPvxRV3f+wgAfdPrbFNTa1GxlnuWHt1VdhmCE= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.103.0/go.mod h1:Cbxjv58ed08t7VEcQa/NuC7mG5xZfn6rVAL0umg3yqI= +github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.104.0 h1:6dvpPt8pCcV+TfMnnanFk2NQYf9HN1voSS9iIHdW+L8= +github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.104.0/go.mod h1:MfSM6mt9qH3vHCaj2rlX6IY/7fN+zCLzNJC25XG9rNU= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.104.0 h1:TmGpGZNos5J9+btaJi8sf8giuYlJC0H9ZjssCV/5oh8= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.104.0/go.mod h1:H+G00lG2WpFeVk/YPNfmv1kyZxfk8gZYlNcK83m5+mI= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.104.0 h1:e3+VsEJreBOkfmVQMVvxczFt1j+vNYhebKKkohbfon8= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.104.0/go.mod h1:OlKFFaRQLO24r37mi2ecwwNNm0CIIjAg60gt4a/EEl0= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.104.0 h1:NzVjVoPBycL6bGSMLvG1tqCmgojtjuEM6YzC9aOnyrQ= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.104.0/go.mod h1:VzTqB3ROJkPItYc5J5ed2GPjH/HbThZ751Qhb9NcE6c= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension v0.104.0 h1:Pz96i3lLRgS3y1G/HtwPUSQB4ZiLCWPBEKrkAp4ltds= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension v0.104.0/go.mod h1:WMwENvbovxniehviZEEU8lwyq1aELBJDj+hiFljNejk= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.104.0 h1:VD2R4q2XziQCJIAsQG2qhlSKyDoT9XaTR2LNkJHs2C0= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.104.0/go.mod h1:sOdPmcOeSXXqZeBflu3Oa+0aWFL8QkAKpr/X1txJYSs= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.104.0 h1:a8d7vQHf/cnmT79z/XH1i8jJjk+goMHkmKg4xeoTiQ0= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.104.0/go.mod h1:Af5P8WhiPSoYWIvoeUYsq27FL/B0idEN1uQULvnGk8g= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.104.0 h1:KmZvS+RN2w4zxMuX1yiobjkN8fvwBUJ+vl5LkO3O7bk= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.104.0/go.mod h1:fc7PiNmgpw+RlWzdWcuoiH9mIlDgiryy70ZjEJC+nlY= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.104.0 h1:4ke4j/y7AQnRAyYveB+KGcdjVYEKVrwTxc3BDHagdd0= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.104.0/go.mod h1:I2zX9YBggIum9LAHXN1DqqbYOENrHXbXdkXouhwVCHw= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.104.0 h1:/koTWTWCFF7tBYkDX5UzCaEc/ceTU8jij/Yzuj0So3M= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.104.0/go.mod h1:KWVekIHTPScOrLKVYOiijxfEdGK5OBhD4EFNBh96ESg= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.104.0 h1:4dU16tXhXWUfOYHoDtpEJHYze1ltgMFWvD1jWVeARRI= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.104.0/go.mod h1:poM/ch3rxaWlkiGV3ohdEDALhfwx6jaKd1z7xk6iY0o= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.104.0 h1:j5EAcIE5iA03KdrfrmXmplfPc1Lybt6D8RAmuumoq60= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.104.0/go.mod h1:VS66oUydCMwiWl1BFmLs7iNy4lGsfVYsriXr/d1fpAk= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest v0.104.0 h1:yH3BLXIYH8D+NEdnaWN8NMrTmJV/UqB2ySRJGZlZzJI= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest v0.104.0/go.mod h1:hCzgpzXbUUDUlETMDKYOpPaOhPjR9T6M3W3nAW5cGX4= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.104.0 h1:iprZpMt740AC0SNgjsjRT090z2Sz/9D6iWbb0uwZcVE= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.104.0/go.mod h1:jQbfTErSOTuv+Ltld5KQ1rs57nUb2ebptsvz57ssfF4= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.104.0 h1:hB2LSx2h/Xvnfam8jXu8sGy3M6YVSD6bcI5saenp+kY= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.104.0/go.mod h1:jTZf5CwMDiILww23FgxvLdIkCPH952ItR/3dJUb/sSk= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.104.0 h1:dOPRk39L5bwQNbxJ7mSUyHan0un/r9DV9X7G+YrktGk= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.104.0/go.mod h1:nyUlZ88VgBDoA9SfmUs0RcsVzqts9z0PpLxjFZPjD3w= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.104.0 h1:HrmXvaX8dbdEaygJhHMZ8MeHw40qTV0dpkmJDsWM2X4= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.104.0/go.mod h1:+sS/JnqjKPpcG+Zm+02h0te/+6KG86GPAvMgbqr1i+o= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.104.0 h1:sN6l/PdKvzk6vPgqNIecV0juNqb8XFEHsX0Ylhc90rc= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.104.0/go.mod h1:MYPDaWs80sMa0gzKtyFro7WJf3tKc0YMb4IfOZcuPAI= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.104.0 h1:J4VwD+t7XpMuhdgd5KwhI5f17bOKHDD862szUW2ulVo= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.104.0/go.mod h1:MYspCVghl0glPIWT/gca6hXL48fROuJxo7lkEB171Ws= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.104.0 h1:4ES79GC+1fyDlLmC2ASM7MpKGLx1LIBpL8wE7G3zzSA= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.104.0/go.mod h1:h5v/Xn0jreStYi9nyPHjwfYseH8Xe3DznsUNS5R4Oqg= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.104.0 h1:bgS1X1UnUuYfKXsQPq3U50jsMNpN5lI+BcDeklPJOW8= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.104.0/go.mod h1:tImy4FWNu1qpaXRVaNi2BU+TmZHtYgLO6LbB6mspZio= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.104.0 h1:Pl4rXXpRG/xJuNWUS3I/w1jViHcrssMf47bGX/Ug/KY= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.104.0/go.mod h1:tP4dyc5+g/qoXYb8lmNj+y+Nhphn4MkL23/np0Zhx2g= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.104.0 h1:7GOOjgAFyvRS++8Q6BIoczShFdxRtsR2uUWlLw/DKdA= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.104.0/go.mod h1:8DCdU7V1JdcnZtk3X1OvqI5wjpKiULf/wmqhLpsldAc= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.104.0 h1:vP+DbTtQaF4sv2flxZwfY33q9hR2M1bJpSQvuwlDbFY= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.104.0/go.mod h1:eHsCNhiPuHFE5sKlsKzcos4gjkDF0LGnx6RJ/bGb4xw= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.104.0 h1:R0XS3J1awJ5NHNSuxhGL+XGI7DN4v3tcHWw0VKfeoTo= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.104.0/go.mod h1:QAd09DxYjA7EZeksoSLyri6uFNV/RUQQhdw7XF5T0zs= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.104.0 h1:aSXAOm9JoGUGU6yVFULCe/gcls5Ofc8/N609tT1bv2U= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.104.0/go.mod h1:kkTouWK3zdLS3iQXLjX338cPkjo3Ji5qcGvOqlmu0CQ= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.104.0 h1:cygcerFBuD8dbKRL/bm0U9JMl0MDpcbcQyG814QCU1Q= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.104.0/go.mod h1:ygrHdjWKqcv/NjtclZAFw3mE5t/vsjIo/5zmqLHEI/w= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.104.0 h1:3eBOsSL2XmD/3Una1LcghKGATvJzwPpHEH/zZEW3GEA= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.104.0/go.mod h1:vpRTdMLbw7Kj5oxqUFIp4y75ta1uhtmVdDu6XDOwkvI= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.104.0 h1:Vwkk+0+cppH+TrmdiVFWcshhdvh2g2IZEj16V8SLjLw= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.104.0/go.mod h1:QmV2JbLC0lzzi0hMUKv5hJ824wdzvYInjVJsphQQ5Uo= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.104.0 h1:m+GTXZxfvajyiC2Tb+ItpbUvSJs8jtZUDwHOTUqU8GQ= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.104.0/go.mod h1:NAOAFKcnVeSDI4ZALPZOmgC4MzaT8+nnPKgdcjvXgms= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.104.0 h1:IOLup9RIHMwRF2C3fk67/q+4gRMQIWhv5cLMnfpBHwk= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.104.0/go.mod h1:uFaeC99TK2kngdB/VWtgz0kNEAxMDkNEA0jP0FfOXyY= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver v0.104.0 h1:7YyfppGUYsy5JLtuA+Zwqk5u5KCoIYvpxi5UWC+zWuQ= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver v0.104.0/go.mod h1:htiBg7qA+iHbvEuvLXYFzKfN7YWjzIrAl8kn7p3AGCk= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.104.0 h1:+5FViBkbBvewH5huajEx8yW5YWB+CbBzDLlRQITxxFg= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.104.0/go.mod h1:dSGkzxCCrAZ4mpZ4cGt+cWOStvB894ONaHLue/SKqWg= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.104.0 h1:54u8jFK575BEX94f9tWgdopyojOCjUps0Myms+50irA= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.104.0/go.mod h1:YJoZUI6IZ0IJnZsYifJjNkQU9DxiVkO3zU2QbWBaXBg= github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= @@ -1746,6 +1750,8 @@ github.com/poy/onpar v0.0.0-20200406201722-06f95a1c68e8/go.mod h1:nSbFQvMj97ZyhF github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= github.com/pquerna/cachecontrol v0.1.0/go.mod h1:NrUG3Z7Rdu85UNR3vm7SOsl1nFIeSiQnrHV5K9mBcUI= +github.com/prometheus-community/windows_exporter v0.25.1 h1:sagNoaBC1TirUNt8YE4eIpeDNQbswrRHsMxvluYHbyU= +github.com/prometheus-community/windows_exporter v0.25.1/go.mod h1:fmM+2zsneBex4oamnr5YHzikZ+34Zhkxg7h3fZVtDWY= github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= @@ -1776,7 +1782,6 @@ github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8b github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.30.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.31.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= diff --git a/internal/pkg/otel/README.md b/internal/pkg/otel/README.md index 71cdf87866b..27f8acf6304 100644 --- a/internal/pkg/otel/README.md +++ b/internal/pkg/otel/README.md @@ -31,11 +31,11 @@ This section provides a summary of components included in the Elastic Distributi | Component | Version | |---|---| -| filelogreceiver | v0.103.0| -| hostmetricsreceiver | v0.103.0| -| httpcheckreceiver | v0.103.0| -| k8sclusterreceiver | v0.103.0| -| kubeletstatsreceiver | v0.103.0| +| filelogreceiver | v0.104.0| +| hostmetricsreceiver | v0.104.0| +| httpcheckreceiver | v0.104.0| +| k8sclusterreceiver | v0.104.0| +| kubeletstatsreceiver | v0.104.0| | otlpreceiver | v0.104.0| @@ -45,8 +45,8 @@ This section provides a summary of components included in the Elastic Distributi | Component | Version | |---|---| -| elasticsearchexporter | v0.103.1-0.20240701121317-74244e46a6b6| -| fileexporter | v0.103.0| +| elasticsearchexporter | v0.104.0| +| fileexporter | v0.104.0| | debugexporter | v0.104.0| | otlpexporter | v0.104.0| | otlphttpexporter | v0.104.0| @@ -59,12 +59,12 @@ This section provides a summary of components included in the Elastic Distributi | Component | Version | |---|---| | elasticinframetricsprocessor | v0.4.0| -| attributesprocessor | v0.103.0| -| filterprocessor | v0.103.0| -| k8sattributesprocessor | v0.103.0| -| resourcedetectionprocessor | v0.103.0| -| resourceprocessor | v0.103.0| -| transformprocessor | v0.103.0| +| attributesprocessor | v0.104.0| +| filterprocessor | v0.104.0| +| k8sattributesprocessor | v0.104.0| +| resourcedetectionprocessor | v0.104.0| +| resourceprocessor | v0.104.0| +| transformprocessor | v0.104.0| | batchprocessor | v0.104.0| @@ -74,7 +74,7 @@ This section provides a summary of components included in the Elastic Distributi | Component | Version | |---|---| -| storage/filestorage | v0.103.0| +| storage/filestorage | v0.104.0| | memorylimiterextension | v0.104.0| @@ -84,5 +84,5 @@ This section provides a summary of components included in the Elastic Distributi | Component | Version | |---|---| -| spanmetricsconnector | v0.103.0| +| spanmetricsconnector | v0.104.0| From 6328d4bbd4c3bac44856ff350bf0ca075ec6e291 Mon Sep 17 00:00:00 2001 From: Michal Pristas Date: Wed, 3 Jul 2024 14:25:29 +0200 Subject: [PATCH 3/5] Updated config files, removed redundant ones (#5030) --- .../otel/samples/darwin/logs_hostmetrics.yml | 73 ------------------- .../samples/darwin/logs_metrics_traces.yml | 45 ++++++++++-- .../pkg/otel/samples/darwin/platformlogs.yml | 10 ++- .../darwin/platformlogs_hostmetrics.yml | 54 +++++++++++--- .../otel/samples/linux/logs_hostmetrics.yml | 73 ------------------- .../samples/linux/logs_metrics_traces.yml | 47 +++++++++++- .../pkg/otel/samples/linux/platformlogs.yml | 8 ++ .../linux/platformlogs_hostmetrics.yml | 57 ++++++++++++--- 8 files changed, 193 insertions(+), 174 deletions(-) delete mode 100644 internal/pkg/otel/samples/darwin/logs_hostmetrics.yml delete mode 100644 internal/pkg/otel/samples/linux/logs_hostmetrics.yml diff --git a/internal/pkg/otel/samples/darwin/logs_hostmetrics.yml b/internal/pkg/otel/samples/darwin/logs_hostmetrics.yml deleted file mode 100644 index 01b0dcb9009..00000000000 --- a/internal/pkg/otel/samples/darwin/logs_hostmetrics.yml +++ /dev/null @@ -1,73 +0,0 @@ -receivers: - # Receiver for platform specific log files - filelog/platformlogs: - include: [ /var/log/*.log ] -# start_at: beginning - - # Receiver for CPU, Disk, Memory, and Filesystem metrics - hostmetrics/system: - collection_interval: 30s - scrapers: - disk: - filesystem: - cpu: - memory: - -processors: - elasticinframetrics: - resourcedetection: - detectors: ["system"] - system: - hostname_sources: ["os"] - resource_attributes: - host.name: - enabled: true - host.id: - enabled: false - host.arch: - enabled: true - host.ip: - enabled: true - host.mac: - enabled: true - host.cpu.vendor.id: - enabled: true - host.cpu.family: - enabled: true - host.cpu.model.id: - enabled: true - host.cpu.model.name: - enabled: true - host.cpu.stepping: - enabled: true - host.cpu.cache.l2.size: - enabled: true - os.description: - enabled: true - os.type: - enabled: true - -exporters: - elasticsearch: - endpoints: ["${env:ELASTIC_ENDPOINT}"] - api_key: ${env:ELASTIC_API_KEY} - mapping: - mode: ecs - logs_dynamic_index: - enabled: true - metrics_dynamic_index: - enabled: true - traces_dynamic_index: - enabled: true - -service: - pipelines: - metrics/hostmetrics: - receivers: [hostmetrics/system] - processors: [elasticinframetrics, resourcedetection] - exporters: [elasticsearch] - - logs/platformlogs: - receivers: [filelog/platformlogs] - processors: [resourcedetection] - exporters: [elasticsearch] diff --git a/internal/pkg/otel/samples/darwin/logs_metrics_traces.yml b/internal/pkg/otel/samples/darwin/logs_metrics_traces.yml index f4127e2bbac..4d02f696448 100644 --- a/internal/pkg/otel/samples/darwin/logs_metrics_traces.yml +++ b/internal/pkg/otel/samples/darwin/logs_metrics_traces.yml @@ -1,18 +1,38 @@ receivers: - # Receiver for platform specific log files filelog/platformlogs: include: [ /var/log/*.log ] + retry_on_failure: + enabled: true + start_at: end + storage: file_storage # start_at: beginning # Receiver for CPU, Disk, Memory, and Filesystem metrics hostmetrics/system: collection_interval: 30s scrapers: - disk: filesystem: - cpu: memory: + metrics: + system.memory.utilization: + enabled: true + process: + mute_process_exe_error: true + mute_process_io_error: true + mute_process_user_error: true + metrics: + process.threads: + enabled: true + process.open_file_descriptors: + enabled: true + process.memory.utilization: + enabled: true + process.disk.operations: + enabled: true + network: + processes: + load: # Receiver for logs, traces, and metrics from SDKs otlp/fromsdk: @@ -20,6 +40,10 @@ receivers: grpc: http: +extensions: + file_storage: + directory: ${env:STORAGE_DIR} + processors: elasticinframetrics: resourcedetection: @@ -53,9 +77,19 @@ processors: enabled: true os.type: enabled: true + attributes/dataset: + actions: + - key: event.dataset + from_attribute: data_stream.dataset + action: upsert + resource/process: + attributes: + - key: process.executable.name + action: delete + - key: process.executable.path + action: delete exporters: - otlp/apm: endpoint: "${env:APM_ENDPOINT}" headers: @@ -75,6 +109,7 @@ exporters: enabled: true service: + extensions: [file_storage] pipelines: traces/fromsdk: receivers: [otlp/fromsdk] @@ -88,7 +123,7 @@ service: metrics/hostmetrics: receivers: [hostmetrics/system] - processors: [elasticinframetrics, resourcedetection] + processors: [elasticinframetrics, resourcedetection, attributes/dataset, resource/process] exporters: [elasticsearch] logs/fromsdk: diff --git a/internal/pkg/otel/samples/darwin/platformlogs.yml b/internal/pkg/otel/samples/darwin/platformlogs.yml index 2455b1eb9a5..f0a1bff6c8b 100644 --- a/internal/pkg/otel/samples/darwin/platformlogs.yml +++ b/internal/pkg/otel/samples/darwin/platformlogs.yml @@ -2,9 +2,16 @@ receivers: # Receiver for platform specific log files filelog/platformlogs: include: [ /var/log/*.log ] + retry_on_failure: + enabled: true + start_at: end + storage: file_storage # start_at: beginning - +extensions: + file_storage: + directory: ${env:STORAGE_DIR} + processors: resourcedetection: detectors: ["system"] @@ -59,6 +66,7 @@ exporters: enabled: true service: + extensions: [file_storage] pipelines: logs/platformlogs: receivers: [filelog/platformlogs] diff --git a/internal/pkg/otel/samples/darwin/platformlogs_hostmetrics.yml b/internal/pkg/otel/samples/darwin/platformlogs_hostmetrics.yml index 97bcd10facb..912bd53fca0 100644 --- a/internal/pkg/otel/samples/darwin/platformlogs_hostmetrics.yml +++ b/internal/pkg/otel/samples/darwin/platformlogs_hostmetrics.yml @@ -2,18 +2,44 @@ receivers: # Receiver for platform specific log files filelog/platformlogs: include: [ /var/log/*.log ] + retry_on_failure: + enabled: true + start_at: end + storage: file_storage # start_at: beginning # Receiver for CPU, Disk, Memory, and Filesystem metrics hostmetrics/system: collection_interval: 30s scrapers: - disk: filesystem: - cpu: memory: + metrics: + system.memory.utilization: + enabled: true + process: + mute_process_exe_error: true + mute_process_io_error: true + mute_process_user_error: true + metrics: + process.threads: + enabled: true + process.open_file_descriptors: + enabled: true + process.memory.utilization: + enabled: true + process.disk.operations: + enabled: true + network: + processes: + load: + +extensions: + file_storage: + directory: ${env:STORAGE_DIR} processors: + elasticinframetrics: resourcedetection: detectors: ["system"] system: @@ -45,14 +71,19 @@ processors: enabled: true os.type: enabled: true + attributes/dataset: + actions: + - key: event.dataset + from_attribute: data_stream.dataset + action: upsert + resource/process: + attributes: + - key: process.executable.name + action: delete + - key: process.executable.path + action: delete exporters: - # Exporter to print the first 5 logs/metrics and then every 1000th - debug: - verbosity: detailed - sampling_initial: 5 - sampling_thereafter: 1000 - # Exporter to send logs and metrics to Elasticsearch elasticsearch: endpoints: ["${env:ELASTIC_ENDPOINT}"] @@ -67,12 +98,13 @@ exporters: enabled: true service: + extensions: [file_storage] pipelines: metrics/hostmetrics: receivers: [hostmetrics/system] - processors: [resourcedetection] - exporters: [debug, elasticsearch] + processors: [elasticinframetrics, resourcedetection, attributes/dataset, resource/process] + exporters: [elasticsearch] logs/platformlogs: receivers: [filelog/platformlogs] processors: [resourcedetection] - exporters: [debug, elasticsearch] \ No newline at end of file + exporters: [elasticsearch] \ No newline at end of file diff --git a/internal/pkg/otel/samples/linux/logs_hostmetrics.yml b/internal/pkg/otel/samples/linux/logs_hostmetrics.yml deleted file mode 100644 index 01b0dcb9009..00000000000 --- a/internal/pkg/otel/samples/linux/logs_hostmetrics.yml +++ /dev/null @@ -1,73 +0,0 @@ -receivers: - # Receiver for platform specific log files - filelog/platformlogs: - include: [ /var/log/*.log ] -# start_at: beginning - - # Receiver for CPU, Disk, Memory, and Filesystem metrics - hostmetrics/system: - collection_interval: 30s - scrapers: - disk: - filesystem: - cpu: - memory: - -processors: - elasticinframetrics: - resourcedetection: - detectors: ["system"] - system: - hostname_sources: ["os"] - resource_attributes: - host.name: - enabled: true - host.id: - enabled: false - host.arch: - enabled: true - host.ip: - enabled: true - host.mac: - enabled: true - host.cpu.vendor.id: - enabled: true - host.cpu.family: - enabled: true - host.cpu.model.id: - enabled: true - host.cpu.model.name: - enabled: true - host.cpu.stepping: - enabled: true - host.cpu.cache.l2.size: - enabled: true - os.description: - enabled: true - os.type: - enabled: true - -exporters: - elasticsearch: - endpoints: ["${env:ELASTIC_ENDPOINT}"] - api_key: ${env:ELASTIC_API_KEY} - mapping: - mode: ecs - logs_dynamic_index: - enabled: true - metrics_dynamic_index: - enabled: true - traces_dynamic_index: - enabled: true - -service: - pipelines: - metrics/hostmetrics: - receivers: [hostmetrics/system] - processors: [elasticinframetrics, resourcedetection] - exporters: [elasticsearch] - - logs/platformlogs: - receivers: [filelog/platformlogs] - processors: [resourcedetection] - exporters: [elasticsearch] diff --git a/internal/pkg/otel/samples/linux/logs_metrics_traces.yml b/internal/pkg/otel/samples/linux/logs_metrics_traces.yml index f4127e2bbac..954c38c906d 100644 --- a/internal/pkg/otel/samples/linux/logs_metrics_traces.yml +++ b/internal/pkg/otel/samples/linux/logs_metrics_traces.yml @@ -1,8 +1,11 @@ receivers: - # Receiver for platform specific log files filelog/platformlogs: include: [ /var/log/*.log ] + retry_on_failure: + enabled: true + start_at: end + storage: file_storage # start_at: beginning # Receiver for CPU, Disk, Memory, and Filesystem metrics @@ -12,7 +15,31 @@ receivers: disk: filesystem: cpu: + metrics: + system.cpu.utilization: + enabled: true + system.cpu.logical.count: + enabled: true memory: + metrics: + system.memory.utilization: + enabled: true + process: + mute_process_exe_error: true + mute_process_io_error: true + mute_process_user_error: true + metrics: + process.threads: + enabled: true + process.open_file_descriptors: + enabled: true + process.memory.utilization: + enabled: true + process.disk.operations: + enabled: true + network: + processes: + load: # Receiver for logs, traces, and metrics from SDKs otlp/fromsdk: @@ -20,6 +47,10 @@ receivers: grpc: http: +extensions: + file_storage: + directory: ${env:STORAGE_DIR} + processors: elasticinframetrics: resourcedetection: @@ -53,6 +84,17 @@ processors: enabled: true os.type: enabled: true + attributes/dataset: + actions: + - key: event.dataset + from_attribute: data_stream.dataset + action: upsert + resource/process: + attributes: + - key: process.executable.name + action: delete + - key: process.executable.path + action: delete exporters: @@ -75,6 +117,7 @@ exporters: enabled: true service: + extensions: [file_storage] pipelines: traces/fromsdk: receivers: [otlp/fromsdk] @@ -88,7 +131,7 @@ service: metrics/hostmetrics: receivers: [hostmetrics/system] - processors: [elasticinframetrics, resourcedetection] + processors: [elasticinframetrics, resourcedetection, attributes/dataset, resource/process] exporters: [elasticsearch] logs/fromsdk: diff --git a/internal/pkg/otel/samples/linux/platformlogs.yml b/internal/pkg/otel/samples/linux/platformlogs.yml index 2455b1eb9a5..ffacc325a3b 100644 --- a/internal/pkg/otel/samples/linux/platformlogs.yml +++ b/internal/pkg/otel/samples/linux/platformlogs.yml @@ -2,8 +2,15 @@ receivers: # Receiver for platform specific log files filelog/platformlogs: include: [ /var/log/*.log ] + retry_on_failure: + enabled: true + start_at: end + storage: file_storage # start_at: beginning +extensions: + file_storage: + directory: ${env:STORAGE_DIR} processors: resourcedetection: @@ -59,6 +66,7 @@ exporters: enabled: true service: + extensions: [file_storage] pipelines: logs/platformlogs: receivers: [filelog/platformlogs] diff --git a/internal/pkg/otel/samples/linux/platformlogs_hostmetrics.yml b/internal/pkg/otel/samples/linux/platformlogs_hostmetrics.yml index 97bcd10facb..95f7c890d81 100644 --- a/internal/pkg/otel/samples/linux/platformlogs_hostmetrics.yml +++ b/internal/pkg/otel/samples/linux/platformlogs_hostmetrics.yml @@ -2,6 +2,10 @@ receivers: # Receiver for platform specific log files filelog/platformlogs: include: [ /var/log/*.log ] + retry_on_failure: + enabled: true + start_at: end + storage: file_storage # start_at: beginning # Receiver for CPU, Disk, Memory, and Filesystem metrics @@ -11,9 +15,38 @@ receivers: disk: filesystem: cpu: + metrics: + system.cpu.utilization: + enabled: true + system.cpu.logical.count: + enabled: true memory: + metrics: + system.memory.utilization: + enabled: true + process: + mute_process_exe_error: true + mute_process_io_error: true + mute_process_user_error: true + metrics: + process.threads: + enabled: true + process.open_file_descriptors: + enabled: true + process.memory.utilization: + enabled: true + process.disk.operations: + enabled: true + network: + processes: + load: + +extensions: + file_storage: + directory: ${env:STORAGE_DIR} processors: + elasticinframetrics: resourcedetection: detectors: ["system"] system: @@ -45,14 +78,19 @@ processors: enabled: true os.type: enabled: true + attributes/dataset: + actions: + - key: event.dataset + from_attribute: data_stream.dataset + action: upsert + resource/process: + attributes: + - key: process.executable.name + action: delete + - key: process.executable.path + action: delete exporters: - # Exporter to print the first 5 logs/metrics and then every 1000th - debug: - verbosity: detailed - sampling_initial: 5 - sampling_thereafter: 1000 - # Exporter to send logs and metrics to Elasticsearch elasticsearch: endpoints: ["${env:ELASTIC_ENDPOINT}"] @@ -67,12 +105,13 @@ exporters: enabled: true service: + extensions: [file_storage] pipelines: metrics/hostmetrics: receivers: [hostmetrics/system] - processors: [resourcedetection] - exporters: [debug, elasticsearch] + processors: [elasticinframetrics, resourcedetection, attributes/dataset, resource/process] + exporters: [elasticsearch] logs/platformlogs: receivers: [filelog/platformlogs] processors: [resourcedetection] - exporters: [debug, elasticsearch] \ No newline at end of file + exporters: [elasticsearch] \ No newline at end of file From db40ac25757dc35cc61f92a4fea3e8864a97d1cb Mon Sep 17 00:00:00 2001 From: Michal Pristas Date: Wed, 3 Jul 2024 15:04:41 +0200 Subject: [PATCH 4/5] Conditional runtime server for otel mode (#5018) --- internal/pkg/agent/application/application.go | 1 + .../coordinator/coordinator_test.go | 2 +- pkg/component/runtime/manager.go | 112 +++++++++--------- .../runtime/manager_fake_input_test.go | 55 ++++++--- pkg/component/runtime/manager_test.go | 1 + testing/integration/otel_test.go | 32 +++++ 6 files changed, 131 insertions(+), 72 deletions(-) diff --git a/internal/pkg/agent/application/application.go b/internal/pkg/agent/application/application.go index c117c136593..17d85986e59 100644 --- a/internal/pkg/agent/application/application.go +++ b/internal/pkg/agent/application/application.go @@ -124,6 +124,7 @@ func New( tracer, monitor, cfg.Settings.GRPC, + runAsOtel, ) if err != nil { return nil, nil, nil, fmt.Errorf("failed to initialize runtime manager: %w", err) diff --git a/internal/pkg/agent/application/coordinator/coordinator_test.go b/internal/pkg/agent/application/coordinator/coordinator_test.go index d522638a2c4..667887d60df 100644 --- a/internal/pkg/agent/application/coordinator/coordinator_test.go +++ b/internal/pkg/agent/application/coordinator/coordinator_test.go @@ -922,7 +922,7 @@ func createCoordinator(t *testing.T, ctx context.Context, opts ...CoordinatorOpt require.NoError(t, err) monitoringMgr := newTestMonitoringMgr() - rm, err := runtime.NewManager(l, l, ai, apmtest.DiscardTracer, monitoringMgr, configuration.DefaultGRPCConfig()) + rm, err := runtime.NewManager(l, l, ai, apmtest.DiscardTracer, monitoringMgr, configuration.DefaultGRPCConfig(), false) require.NoError(t, err) caps, err := capabilities.LoadFile(paths.AgentCapabilitiesPath(), l) diff --git a/pkg/component/runtime/manager.go b/pkg/component/runtime/manager.go index b382dfac39a..30040d5bdae 100644 --- a/pkg/component/runtime/manager.go +++ b/pkg/component/runtime/manager.go @@ -148,7 +148,8 @@ type Manager struct { // doneChan is closed when Manager is shutting down to signal that any // pending requests should be canceled. - doneChan chan struct{} + doneChan chan struct{} + runAsOtel bool } // NewManager creates a new manager. @@ -159,6 +160,7 @@ func NewManager( tracer *apm.Tracer, monitor MonitoringManager, grpcConfig *configuration.GRPCConfig, + runAsOtel bool, ) (*Manager, error) { ca, err := authority.NewCA() if err != nil { @@ -195,6 +197,7 @@ func NewManager( grpcConfig: grpcConfig, serverReady: &atomic.Bool{}, doneChan: make(chan struct{}), + runAsOtel: runAsOtel, } return m, nil } @@ -210,58 +213,59 @@ func (m *Manager) Run(ctx context.Context) error { var ( listener net.Listener err error + server *grpc.Server + wgServer sync.WaitGroup ) - if m.isLocal { - listener, err = ipc.CreateListener(m.logger, m.listenAddr) - } else { - listener, err = net.Listen("tcp", m.listenAddr) - } + if !m.runAsOtel { + if m.isLocal { + listener, err = ipc.CreateListener(m.logger, m.listenAddr) + } else { + listener, err = net.Listen("tcp", m.listenAddr) + } - if err != nil { - return fmt.Errorf("error starting tcp listener for runtime manager: %w", err) - } + if err != nil { + return fmt.Errorf("error starting tcp listener for runtime manager: %w", err) + } - if m.isLocal { - defer ipc.CleanupListener(m.logger, m.listenAddr) - } else { - m.listenPort = listener.Addr().(*net.TCPAddr).Port - } - - certPool := x509.NewCertPool() - if ok := certPool.AppendCertsFromPEM(m.ca.Crt()); !ok { - return errors.New("failed to append root CA") - } - creds := credentials.NewTLS(&tls.Config{ - ClientAuth: tls.RequireAndVerifyClientCert, - ClientCAs: certPool, - GetCertificate: m.getCertificate, - MinVersion: tls.VersionTLS12, - }) - - var server *grpc.Server - m.logger.Infof("Starting grpc control protocol listener on port %v with max_message_size %v", m.grpcConfig.Port, m.grpcConfig.MaxMsgSize) - if m.tracer != nil { - apmInterceptor := apmgrpc.NewUnaryServerInterceptor(apmgrpc.WithRecovery(), apmgrpc.WithTracer(m.tracer)) - server = grpc.NewServer( - grpc.UnaryInterceptor(apmInterceptor), - grpc.Creds(creds), - grpc.MaxRecvMsgSize(m.grpcConfig.MaxMsgSize), - ) - } else { - server = grpc.NewServer( - grpc.Creds(creds), - grpc.MaxRecvMsgSize(m.grpcConfig.MaxMsgSize), - ) - } - proto.RegisterElasticAgentServer(server, m) + if m.isLocal { + defer ipc.CleanupListener(m.logger, m.listenAddr) + } else { + m.listenPort = listener.Addr().(*net.TCPAddr).Port + } - // start serving GRPC connections - var wgServer sync.WaitGroup - wgServer.Add(1) - go func() { - defer wgServer.Done() - m.serverLoop(ctx, listener, server) - }() + certPool := x509.NewCertPool() + if ok := certPool.AppendCertsFromPEM(m.ca.Crt()); !ok { + return errors.New("failed to append root CA") + } + creds := credentials.NewTLS(&tls.Config{ + ClientAuth: tls.RequireAndVerifyClientCert, + ClientCAs: certPool, + GetCertificate: m.getCertificate, + MinVersion: tls.VersionTLS12, + }) + m.logger.Infof("Starting grpc control protocol listener on port %v with max_message_size %v", m.grpcConfig.Port, m.grpcConfig.MaxMsgSize) + if m.tracer != nil { + apmInterceptor := apmgrpc.NewUnaryServerInterceptor(apmgrpc.WithRecovery(), apmgrpc.WithTracer(m.tracer)) + server = grpc.NewServer( + grpc.UnaryInterceptor(apmInterceptor), + grpc.Creds(creds), + grpc.MaxRecvMsgSize(m.grpcConfig.MaxMsgSize), + ) + } else { + server = grpc.NewServer( + grpc.Creds(creds), + grpc.MaxRecvMsgSize(m.grpcConfig.MaxMsgSize), + ) + } + proto.RegisterElasticAgentServer(server, m) + + // start serving GRPC connections + wgServer.Add(1) + go func() { + defer wgServer.Done() + m.serverLoop(ctx, listener, server) + }() + } // Start the run loop, which continues on the main goroutine // until the context is canceled. @@ -271,11 +275,13 @@ func (m *Manager) Run(ctx context.Context) error { m.shutdown() // Close the rpc listener and wait for serverLoop to return - listener.Close() - wgServer.Wait() + if !m.runAsOtel { + listener.Close() + wgServer.Wait() - // Cancel any remaining connections - server.Stop() + // Cancel any remaining connections + server.Stop() + } return ctx.Err() } diff --git a/pkg/component/runtime/manager_fake_input_test.go b/pkg/component/runtime/manager_fake_input_test.go index 534c0639f63..ee811874088 100644 --- a/pkg/component/runtime/manager_fake_input_test.go +++ b/pkg/component/runtime/manager_fake_input_test.go @@ -112,7 +112,8 @@ func (suite *FakeInputSuite) TestManager_Features() { agentInfo, apmtest.DiscardTracer, newTestMonitoringMgr(), - configuration.DefaultGRPCConfig()) + configuration.DefaultGRPCConfig(), + false) require.NoError(t, err) managerErrCh := make(chan error) @@ -312,7 +313,8 @@ func (suite *FakeInputSuite) TestManager_APM() { agentInfo, apmtest.DiscardTracer, newTestMonitoringMgr(), - configuration.DefaultGRPCConfig()) + configuration.DefaultGRPCConfig(), + false) require.NoError(t, err) managerErrCh := make(chan error) @@ -547,6 +549,7 @@ func (suite *FakeInputSuite) TestManager_Limits() { apmtest.DiscardTracer, newTestMonitoringMgr(), configuration.DefaultGRPCConfig(), + false, ) require.NoError(t, err) @@ -710,6 +713,7 @@ func (suite *FakeInputSuite) TestManager_ShipperLimits() { apmtest.DiscardTracer, newTestMonitoringMgr(), configuration.DefaultGRPCConfig(), + false, ) require.NoError(t, err) @@ -866,7 +870,8 @@ func (suite *FakeInputSuite) TestManager_BadUnitToGood() { defer cancel() ai := &info.AgentInfo{} - m, err := NewManager(newDebugLogger(t), newDebugLogger(t), ai, apmtest.DiscardTracer, newTestMonitoringMgr(), configuration.DefaultGRPCConfig()) + m, err := NewManager(newDebugLogger(t), newDebugLogger(t), ai, apmtest.DiscardTracer, newTestMonitoringMgr(), configuration.DefaultGRPCConfig(), + false) require.NoError(t, err) errCh := make(chan error) go func() { @@ -1035,7 +1040,8 @@ func (suite *FakeInputSuite) TestManager_GoodUnitToBad() { defer cancel() ai := &info.AgentInfo{} - m, err := NewManager(newDebugLogger(t), newDebugLogger(t), ai, apmtest.DiscardTracer, newTestMonitoringMgr(), configuration.DefaultGRPCConfig()) + m, err := NewManager(newDebugLogger(t), newDebugLogger(t), ai, apmtest.DiscardTracer, newTestMonitoringMgr(), configuration.DefaultGRPCConfig(), + false) require.NoError(t, err) runResultChan := make(chan error, 1) go func() { @@ -1217,7 +1223,8 @@ func (suite *FakeInputSuite) TestManager_NoDeadlock() { // Create the runtime manager ai := &info.AgentInfo{} - m, err := NewManager(newDebugLogger(t), newDebugLogger(t), ai, apmtest.DiscardTracer, newTestMonitoringMgr(), configuration.DefaultGRPCConfig()) + m, err := NewManager(newDebugLogger(t), newDebugLogger(t), ai, apmtest.DiscardTracer, newTestMonitoringMgr(), configuration.DefaultGRPCConfig(), + false) require.NoError(t, err) // Start the runtime manager in a goroutine, passing its termination state @@ -1291,7 +1298,8 @@ func (suite *FakeInputSuite) TestManager_Configure() { defer cancel() ai := &info.AgentInfo{} - m, err := NewManager(newDebugLogger(t), newDebugLogger(t), ai, apmtest.DiscardTracer, newTestMonitoringMgr(), configuration.DefaultGRPCConfig()) + m, err := NewManager(newDebugLogger(t), newDebugLogger(t), ai, apmtest.DiscardTracer, newTestMonitoringMgr(), configuration.DefaultGRPCConfig(), + false) require.NoError(t, err) errCh := make(chan error) go func() { @@ -1413,7 +1421,8 @@ func (suite *FakeInputSuite) TestManager_RemoveUnit() { defer cancel() ai := &info.AgentInfo{} - m, err := NewManager(newDebugLogger(t), newDebugLogger(t), ai, apmtest.DiscardTracer, newTestMonitoringMgr(), configuration.DefaultGRPCConfig()) + m, err := NewManager(newDebugLogger(t), newDebugLogger(t), ai, apmtest.DiscardTracer, newTestMonitoringMgr(), configuration.DefaultGRPCConfig(), + false) require.NoError(t, err) errCh := make(chan error) go func() { @@ -1568,7 +1577,8 @@ func (suite *FakeInputSuite) TestManager_ActionState() { defer cancel() ai := &info.AgentInfo{} - m, err := NewManager(newDebugLogger(t), newDebugLogger(t), ai, apmtest.DiscardTracer, newTestMonitoringMgr(), configuration.DefaultGRPCConfig()) + m, err := NewManager(newDebugLogger(t), newDebugLogger(t), ai, apmtest.DiscardTracer, newTestMonitoringMgr(), configuration.DefaultGRPCConfig(), + false) require.NoError(t, err) errCh := make(chan error) go func() { @@ -1693,7 +1703,8 @@ func (suite *FakeInputSuite) TestManager_Restarts() { defer cancel() ai := &info.AgentInfo{} - m, err := NewManager(newDebugLogger(t), newDebugLogger(t), ai, apmtest.DiscardTracer, newTestMonitoringMgr(), configuration.DefaultGRPCConfig()) + m, err := NewManager(newDebugLogger(t), newDebugLogger(t), ai, apmtest.DiscardTracer, newTestMonitoringMgr(), configuration.DefaultGRPCConfig(), + false) require.NoError(t, err) errCh := make(chan error) go func() { @@ -1829,7 +1840,8 @@ func (suite *FakeInputSuite) TestManager_Restarts_ConfigKill() { defer cancel() ai := &info.AgentInfo{} - m, err := NewManager(newDebugLogger(t), newDebugLogger(t), ai, apmtest.DiscardTracer, newTestMonitoringMgr(), configuration.DefaultGRPCConfig()) + m, err := NewManager(newDebugLogger(t), newDebugLogger(t), ai, apmtest.DiscardTracer, newTestMonitoringMgr(), configuration.DefaultGRPCConfig(), + false) require.NoError(t, err) errCh := make(chan error) go func() { @@ -1973,7 +1985,8 @@ func (suite *FakeInputSuite) TestManager_KeepsRestarting() { defer cancel() ai := &info.AgentInfo{} - m, err := NewManager(newDebugLogger(t), newDebugLogger(t), ai, apmtest.DiscardTracer, newTestMonitoringMgr(), configuration.DefaultGRPCConfig()) + m, err := NewManager(newDebugLogger(t), newDebugLogger(t), ai, apmtest.DiscardTracer, newTestMonitoringMgr(), configuration.DefaultGRPCConfig(), + false) require.NoError(t, err) errCh := make(chan error) go func() { @@ -2117,7 +2130,8 @@ func (suite *FakeInputSuite) TestManager_RestartsOnMissedCheckins() { defer cancel() ai := &info.AgentInfo{} - m, err := NewManager(newDebugLogger(t), newDebugLogger(t), ai, apmtest.DiscardTracer, newTestMonitoringMgr(), configuration.DefaultGRPCConfig()) + m, err := NewManager(newDebugLogger(t), newDebugLogger(t), ai, apmtest.DiscardTracer, newTestMonitoringMgr(), configuration.DefaultGRPCConfig(), + false) require.NoError(t, err) errCh := make(chan error) go func() { @@ -2236,7 +2250,8 @@ func (suite *FakeInputSuite) TestManager_InvalidAction() { defer cancel() ai := &info.AgentInfo{} - m, err := NewManager(newDebugLogger(t), newDebugLogger(t), ai, apmtest.DiscardTracer, newTestMonitoringMgr(), configuration.DefaultGRPCConfig()) + m, err := NewManager(newDebugLogger(t), newDebugLogger(t), ai, apmtest.DiscardTracer, newTestMonitoringMgr(), configuration.DefaultGRPCConfig(), + false) require.NoError(t, err) errCh := make(chan error) go func() { @@ -2360,7 +2375,8 @@ func (suite *FakeInputSuite) TestManager_MultiComponent() { agentInfo, apmtest.DiscardTracer, newTestMonitoringMgr(), - configuration.DefaultGRPCConfig()) + configuration.DefaultGRPCConfig(), + false) require.NoError(t, err) errCh := make(chan error) @@ -2573,7 +2589,8 @@ func (suite *FakeInputSuite) TestManager_LogLevel() { ai, apmtest.DiscardTracer, newTestMonitoringMgr(), - configuration.DefaultGRPCConfig()) + configuration.DefaultGRPCConfig(), + false) require.NoError(t, err) errCh := make(chan error) @@ -2719,7 +2736,8 @@ func (suite *FakeInputSuite) TestManager_Shipper() { defer cancel() ai := &info.AgentInfo{} - m, err := NewManager(newDebugLogger(t), newDebugLogger(t), ai, apmtest.DiscardTracer, newTestMonitoringMgr(), configuration.DefaultGRPCConfig()) + m, err := NewManager(newDebugLogger(t), newDebugLogger(t), ai, apmtest.DiscardTracer, newTestMonitoringMgr(), configuration.DefaultGRPCConfig(), + false) require.NoError(t, err) errCh := make(chan error) go func() { @@ -3022,7 +3040,8 @@ func (suite *FakeInputSuite) TestManager_StartStopComponent() { ai, apmtest.DiscardTracer, newTestMonitoringMgr(), - configuration.DefaultGRPCConfig()) + configuration.DefaultGRPCConfig(), + false) require.NoError(t, err, "could not crete new manager") managerErrCh := make(chan error) @@ -3206,7 +3225,7 @@ func (suite *FakeInputSuite) TestManager_Chunk() { grpcConfig.MaxMsgSize = grpcDefaultSize * 2 // set to double the default size ai := &info.AgentInfo{} - m, err := NewManager(newDebugLogger(t), newDebugLogger(t), ai, apmtest.DiscardTracer, newTestMonitoringMgr(), grpcConfig) + m, err := NewManager(newDebugLogger(t), newDebugLogger(t), ai, apmtest.DiscardTracer, newTestMonitoringMgr(), grpcConfig, false) require.NoError(t, err) errCh := make(chan error) go func() { diff --git a/pkg/component/runtime/manager_test.go b/pkg/component/runtime/manager_test.go index 9e769f4b638..153ecc5573d 100644 --- a/pkg/component/runtime/manager_test.go +++ b/pkg/component/runtime/manager_test.go @@ -35,6 +35,7 @@ func TestManager_SimpleComponentErr(t *testing.T) { apmtest.DiscardTracer, newTestMonitoringMgr(), configuration.DefaultGRPCConfig(), + false, ) require.NoError(t, err) diff --git a/testing/integration/otel_test.go b/testing/integration/otel_test.go index 962f0feba04..dd893413986 100644 --- a/testing/integration/otel_test.go +++ b/testing/integration/otel_test.go @@ -20,7 +20,10 @@ import ( "github.com/stretchr/testify/require" + "github.com/elastic/elastic-agent/pkg/control/v2/client" aTesting "github.com/elastic/elastic-agent/pkg/testing" + atesting "github.com/elastic/elastic-agent/pkg/testing" + integrationtest "github.com/elastic/elastic-agent/pkg/testing" "github.com/elastic/elastic-agent/pkg/testing/define" "github.com/elastic/elastic-agent/pkg/testing/tools/estools" "github.com/elastic/elastic-agent/pkg/testing/tools/testcontext" @@ -192,6 +195,8 @@ func TestOtelFileProcessing(t *testing.T) { 3*time.Minute, 500*time.Millisecond, fmt.Sprintf("there should be exported logs by now")) + testAgentCanRun(ctx, t, fixture) + cancel() fixtureWg.Wait() require.True(t, err == nil || err == context.Canceled || err == context.DeadlineExceeded, "Retrieved unexpected error: %s", err.Error()) @@ -446,3 +451,30 @@ func mapAtLeastOneTrue(mm map[string]bool) bool { return false } + +func testAgentCanRun(ctx context.Context, t *testing.T, fixture *atesting.Fixture) func(*testing.T) { + tCtx, cancel := testcontext.WithDeadline(t, ctx, time.Now().Add(5*time.Minute)) + defer cancel() + + return func(t *testing.T) { + // Get path to Elastic Agent executable + devFixture, err := define.NewFixtureFromLocalBuild(t, define.Version()) + require.NoError(t, err) + + // Prepare the Elastic Agent so the binary is extracted and ready to use. + err = devFixture.Prepare(tCtx) + require.NoError(t, err) + + require.Eventually( + t, + func() bool { + return nil == devFixture.Run(tCtx, integrationtest.State{ + Configure: complexIsolatedUnitsConfig, + AgentState: integrationtest.NewClientState(client.Healthy), + }) + }, + 5*time.Minute, 500*time.Millisecond, + "Agent should not return error", + ) + } +} From a1fc48049175c0199b34349a51fb7ff66980f5f5 Mon Sep 17 00:00:00 2001 From: Anderson Queiroz Date: Wed, 3 Jul 2024 16:59:46 +0200 Subject: [PATCH 5/5] improve the enroll sub command help (#5048) --- internal/pkg/agent/cmd/enroll.go | 48 ++++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/internal/pkg/agent/cmd/enroll.go b/internal/pkg/agent/cmd/enroll.go index c6d39dc9878..1cb9c816333 100644 --- a/internal/pkg/agent/cmd/enroll.go +++ b/internal/pkg/agent/cmd/enroll.go @@ -63,37 +63,37 @@ func newEnrollCommandWithArgs(_ []string, streams *cli.IOStreams) *cobra.Command func addEnrollFlags(cmd *cobra.Command) { cmd.Flags().StringP("url", "", "", "URL to enroll Agent into Fleet") cmd.Flags().StringP("enrollment-token", "t", "", "Enrollment token to use to enroll Agent into Fleet") - cmd.Flags().StringP("fleet-server-es", "", "", "Start and run a Fleet Server along side this Elastic Agent connecting to the provided elasticsearch") - cmd.Flags().StringP("fleet-server-es-ca", "", "", "Path to certificate authority to use with communicate with elasticsearch") - cmd.Flags().StringP("fleet-server-es-ca-trusted-fingerprint", "", "", "Elasticsearch certificate authority's SHA256 fingerprint") - cmd.Flags().BoolP("fleet-server-es-insecure", "", false, "Disables validation of certificates") - cmd.Flags().StringP("fleet-server-es-cert", "", "", "Client certificate to use when connecting to Elasticsearch.") - cmd.Flags().StringP("fleet-server-es-cert-key", "", "", "Client private key to use when connecing to Elasticsearch.") - cmd.Flags().StringP("fleet-server-service-token", "", "", "Service token to use for communication with elasticsearch") - cmd.Flags().StringP("fleet-server-service-token-path", "", "", "Filepath for service token secret file to use for communication with elasticsearch") + cmd.Flags().StringP("fleet-server-es", "", "", "Start and run a Fleet Server alongside this Elastic Agent connecting to the provided Elasticsearch") + cmd.Flags().StringP("fleet-server-es-ca", "", "", "Path to certificate authority for Fleet Server to use to communicate with Elasticsearch") + cmd.Flags().StringP("fleet-server-es-ca-trusted-fingerprint", "", "", "Elasticsearch certificate authority's SHA256 fingerprint for Fleet Server to use") + cmd.Flags().BoolP("fleet-server-es-insecure", "", false, "Disables validation of Elasticsearch certificates for Fleet Server") + cmd.Flags().StringP("fleet-server-es-cert", "", "", "Client certificate for Fleet Server to use when connecting to Elasticsearch") + cmd.Flags().StringP("fleet-server-es-cert-key", "", "", "Client private key for Fleet Server to use when connecting to Elasticsearch") + cmd.Flags().StringP("fleet-server-service-token", "", "", "Service token for Fleet Server to use for communication with Elasticsearch") + cmd.Flags().StringP("fleet-server-service-token-path", "", "", "Filepath for the service token secret file used by Fleet Server for communication with Elasticsearch") cmd.Flags().StringP("fleet-server-policy", "", "", "Start and run a Fleet Server on this specific policy") cmd.Flags().StringP("fleet-server-host", "", "", "Fleet Server HTTP binding host (overrides the policy)") cmd.Flags().Uint16P("fleet-server-port", "", 0, "Fleet Server HTTP binding port (overrides the policy)") - cmd.Flags().StringP("fleet-server-cert", "", "", "Certificate to use for exposed Fleet Server HTTPS endpoint") - cmd.Flags().StringP("fleet-server-cert-key", "", "", "Private key to use for exposed Fleet Server HTTPS endpoint") - cmd.Flags().StringP("fleet-server-cert-key-passphrase", "", "", "Path for private key passphrase file used to decrypt certificate key") - cmd.Flags().StringP("fleet-server-client-auth", "", "none", "Fleet-server mTLS client authentication for connecting elastic-agents. Must be one of [none, optional, required]") - cmd.Flags().StringSliceP("header", "", []string{}, "Headers used in communication with elasticsearch") + cmd.Flags().StringP("fleet-server-cert", "", "", "Certificate for Fleet Server to use for exposed HTTPS endpoint") + cmd.Flags().StringP("fleet-server-cert-key", "", "", "Private key for the certificate used by Fleet Server for exposed HTTPS endpoint") + cmd.Flags().StringP("fleet-server-cert-key-passphrase", "", "", "Path for private key passphrase file used to decrypt Fleet Server certificate key") + cmd.Flags().StringP("fleet-server-client-auth", "", "none", "Fleet Server mTLS client authentication for connecting Elastic Agents. Must be one of [none, optional, required]") + cmd.Flags().StringSliceP("header", "", []string{}, "Headers used by Fleet Server when communicating with Elasticsearch") cmd.Flags().BoolP("fleet-server-insecure-http", "", false, "Expose Fleet Server over HTTP (not recommended; insecure)") - cmd.Flags().StringP("certificate-authorities", "a", "", "Comma separated list of root certificate for server verifications") - cmd.Flags().StringP("ca-sha256", "p", "", "Comma separated list of certificate authorities hash pins used for certificate verifications") - cmd.Flags().StringP("elastic-agent-cert", "", "", "Elastic-agent client certificate to use with fleet-server during authentication") - cmd.Flags().StringP("elastic-agent-cert-key", "", "", "Elastic-agent client certificate to use with fleet-server during authentication") - cmd.Flags().BoolP("insecure", "i", false, "Allow insecure connection to fleet-server") - cmd.Flags().StringP("staging", "", "", "Configures agent to download artifacts from a staging build") - cmd.Flags().StringP("proxy-url", "", "", "Configures the proxy url") - cmd.Flags().BoolP("proxy-disabled", "", false, "Disable proxy support including environment variables") - cmd.Flags().StringSliceP("proxy-header", "", []string{}, "Proxy headers used with CONNECT request") + cmd.Flags().StringP("certificate-authorities", "a", "", "Comma-separated list of root certificates for server verification used by Elastic Agent and Fleet Server") + cmd.Flags().StringP("ca-sha256", "p", "", "Comma-separated list of certificate authority hash pins for server verification used by Elastic Agent and Fleet Server") + cmd.Flags().StringP("elastic-agent-cert", "", "", "Elastic Agent client certificate to use with Fleet Server during mTLS authentication") + cmd.Flags().StringP("elastic-agent-cert-key", "", "", "Elastic Agent client private key to use with Fleet Server during mTLS authentication") + cmd.Flags().BoolP("insecure", "i", false, "Allow insecure connection made by the Elastic Agent. It's also required to use a Fleet Server on a HTTP endpoint") + cmd.Flags().StringP("staging", "", "", "Configures Elastic Agent to download artifacts from a staging build") + cmd.Flags().StringP("proxy-url", "", "", "Configures the proxy URL: when bootstrapping Fleet Server, it's the proxy used by Fleet Server to connect to Elasticsearch; when enrolling the Elastic Agent to Fleet Server, it's the proxy used by the Elastic Agent to connect to Fleet Server") + cmd.Flags().BoolP("proxy-disabled", "", false, "Disable proxy support including environment variables: when bootstrapping Fleet Server, it's the proxy used by Fleet Server to connect to Elasticsearch; when enrolling the Elastic Agent to Fleet Server, it's the proxy used by the Elastic Agent to connect to Fleet Server") + cmd.Flags().StringSliceP("proxy-header", "", []string{}, "Proxy headers used with CONNECT request: when bootstrapping Fleet Server, it's the proxy used by Fleet Server to connect to Elasticsearch; when enrolling the Elastic Agent to Fleet Server, it's the proxy used by the Elastic Agent to connect to Fleet Server") cmd.Flags().BoolP("delay-enroll", "", false, "Delays enrollment to occur on first start of the Elastic Agent service") cmd.Flags().DurationP("daemon-timeout", "", 0, "Timeout waiting for Elastic Agent daemon") - cmd.Flags().DurationP("fleet-server-timeout", "", 0, "Timeout waiting for Fleet Server to be ready to start enrollment") + cmd.Flags().DurationP("fleet-server-timeout", "", 0, "When bootstrapping Fleet Server, timeout waiting for Fleet Server to be ready to start enrollment") cmd.Flags().Bool("skip-daemon-reload", false, "Skip daemon reload after enrolling") - cmd.Flags().StringSliceP("tag", "", []string{}, "User set tags") + cmd.Flags().StringSliceP("tag", "", []string{}, "User-set tags") cmd.Flags().MarkHidden("skip-daemon-reload") //nolint:errcheck // an error is only returned if the flag does not exist. }