diff --git a/NOTICE.txt b/NOTICE.txt index fa15ced6896..21d25148e3f 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -3188,11 +3188,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-c -------------------------------------------------------------------------------- Dependency : github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor -Version: v0.2.1 +Version: v0.3.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor@v0.2.1/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor@v0.3.0/LICENSE: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index 59dcaebb6e0..2328f0093f2 100644 --- a/go.mod +++ b/go.mod @@ -23,8 +23,13 @@ require ( github.com/elastic/go-ucfg v0.8.8 github.com/elastic/mock-es v0.0.0-20240712014503-e5b47ece0015 github.com/elastic/opentelemetry-collector-components/connector/signaltometricsconnector v0.2.1 +<<<<<<< HEAD github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.12.0 github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor v0.2.1 +======= + github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.13.0 + github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor v0.3.0 +>>>>>>> 30688d4eb8 (build(deps): bump github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor (#5843)) github.com/elastic/opentelemetry-collector-components/processor/lsmintervalprocessor v0.2.0 github.com/fatih/color v1.17.0 github.com/fsnotify/fsnotify v1.7.0 diff --git a/go.sum b/go.sum index e9b33e1be76..ecb969bc5bc 100644 --- a/go.sum +++ b/go.sum @@ -296,10 +296,17 @@ github.com/elastic/mock-es v0.0.0-20240712014503-e5b47ece0015 h1:z8cC8GASpPo8yKl github.com/elastic/mock-es v0.0.0-20240712014503-e5b47ece0015/go.mod h1:qH9DX/Dmflz6EAtaks/+2SsdQzecVAKE174Zl66hk7E= github.com/elastic/opentelemetry-collector-components/connector/signaltometricsconnector v0.2.1 h1:OLpob3qEleqQnlgnBRJyClWr63TVThJd5s06CFnzKFI= github.com/elastic/opentelemetry-collector-components/connector/signaltometricsconnector v0.2.1/go.mod h1:zIiDkPObWcSOpOzD3iWkaGawMs97oYLFA6i0T5Uv1EI= +<<<<<<< HEAD github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.12.0 h1:G5JJsgbpD+8ZXZ17UlDLOgW9E8nwLdmSjm1sppDi/cU= github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.12.0/go.mod h1:TO8sejwFXzqSyOmL9M8lL6baavxERg9UGJXfYKHdlfA= github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor v0.2.1 h1:7cCOF19TJPivDc/QjV0VxU1ySwDib6TS2WJ9TP3iEpk= github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor v0.2.1/go.mod h1:GSVGd0yJHBXevzOdChtzJFAcrex+iHCNju3fu5QwW14= +======= +github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.13.0 h1:Y8DWrxdpNMscYXTN3EoK509vqf+0aD1RfNZF5wOtsQs= +github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.13.0/go.mod h1:iLTitn5RdFtBHYLC2YVAgjv2OxCKY51rdhtrsT1hQ8I= +github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor v0.3.0 h1:LgVBXE5ASDsheFLyM4ILG3jTuK3eJ6S67/NcKsHKP2Q= +github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor v0.3.0/go.mod h1:G0l0UkTeT1lxWCvURonQQLgNcaWX6bBuQexp5tubUZ8= +>>>>>>> 30688d4eb8 (build(deps): bump github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor (#5843)) github.com/elastic/opentelemetry-collector-components/processor/lsmintervalprocessor v0.2.0 h1:hS4YRZG4W50od8HMbZM9EQTe0fxWDpCAgo7tAVxuFFE= github.com/elastic/opentelemetry-collector-components/processor/lsmintervalprocessor v0.2.0/go.mod h1:/bETRmbfuqPwSI0Y/lVRCGRXhjbnTNKfHZS0NEKffGQ= github.com/elastic/opentelemetry-lib v0.12.0 h1:SiCGkT7gLOzkl0wQosQrIWjHWb5eJY18Cm3V3GmdU0o= diff --git a/internal/pkg/otel/README.md b/internal/pkg/otel/README.md index d84af99557c..92cd2135ac4 100644 --- a/internal/pkg/otel/README.md +++ b/internal/pkg/otel/README.md @@ -54,8 +54,13 @@ This section provides a summary of components included in the Elastic Distributi | Component | Version | |---|---| +<<<<<<< HEAD | [elasticinframetricsprocessor](https://github.com/elastic/opentelemetry-collector-components/blob/processor/elasticinframetricsprocessor/v0.12.0/processor/elasticinframetricsprocessor/README.md) | v0.12.0 | | [elastictraceprocessor](https://github.com/elastic/opentelemetry-collector-components/blob/processor/elastictraceprocessor/v0.2.1/processor/elastictraceprocessor/README.md) | v0.2.1 | +======= +| [elasticinframetricsprocessor](https://github.com/elastic/opentelemetry-collector-components/blob/processor/elasticinframetricsprocessor/v0.13.0/processor/elasticinframetricsprocessor/README.md) | v0.13.0 | +| [elastictraceprocessor](https://github.com/elastic/opentelemetry-collector-components/blob/processor/elastictraceprocessor/v0.3.0/processor/elastictraceprocessor/README.md) | v0.3.0 | +>>>>>>> 30688d4eb8 (build(deps): bump github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor (#5843)) | [lsmintervalprocessor](https://github.com/elastic/opentelemetry-collector-components/blob/processor/lsmintervalprocessor/v0.2.0/processor/lsmintervalprocessor/README.md) | v0.2.0 | | [memorylimiterprocessor](https://github.com/open-telemetry/opentelemetry-collector/blob/processor/memorylimiterprocessor/v0.111.0/processor/memorylimiterprocessor/README.md) | v0.111.0 | | [attributesprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/processor/attributesprocessor/v0.111.0/processor/attributesprocessor/README.md) | v0.111.0 |