Updated es infra processor and dependabot rules to include further up… (

#5061) * updated es infra processor and dependabot rules to include further updates * updated es infra processor and dependabot rules to include further updates (cherry picked from commit 1063e80) # Conflicts: # NOTICE.txt # go.mod # go.sum # internal/pkg/otel/README.md
elastic · Jul 4, 2024 · ea2b8ca · ea2b8ca
1 parent 57477d1
commit ea2b8ca
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 0 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -21,6 +21,7 @@ updates:
       - dependency-name: "github.com/elastic/*"
       - dependency-name: "go.opentelemetry.io/collector/*"
       - dependency-name: "github.com/open-telemetry/opentelemetry-collector-contrib/*"
+      - dependency-name: "github.com/elastic/opentelemetry-collector-components/*"
     reviewers:
       - "elastic/elastic-agent-control-plane"
     open-pull-requests-limit: 10
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -2645,11 +2645,19 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]/
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor
+<<<<<<< HEAD
 Version: v0.2.0
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
 Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/processor/[email protected]/LICENSE:
+=======
+Version: v0.5.1
+Licence type (autodetected): Apache-2.0
+--------------------------------------------------------------------------------
+
+Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/processor/[email protected]/LICENSE:
+>>>>>>> 1063e802d9 (Updated es infra processor and dependabot rules to include further up… (#5061))
 
                                  Apache License
                            Version 2.0, January 2004
@@ -20064,11 +20072,19 @@ limitations under the License.
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/opentelemetry-lib
+<<<<<<< HEAD
 Version: v0.3.0
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
 Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]/LICENSE:
+=======
+Version: v0.6.1
+Licence type (autodetected): Apache-2.0
+--------------------------------------------------------------------------------
+
+Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]/LICENSE:
+>>>>>>> 1063e802d9 (Updated es infra processor and dependabot rules to include further up… (#5061))
 
                                  Apache License
                            Version 2.0, January 2004

diff --git a/go.mod b/go.mod
@@ -23,7 +23,12 @@ require (
 	github.com/elastic/go-licenser v0.4.1
 	github.com/elastic/go-sysinfo v1.14.0
 	github.com/elastic/go-ucfg v0.8.8
+<<<<<<< HEAD
 	github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.2.0
+=======
+	github.com/elastic/mock-es v0.0.0-20240605193845-b5546a703d6f
+	github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.5.1
+>>>>>>> 1063e802d9 (Updated es infra processor and dependabot rules to include further up… (#5061))
 	github.com/fatih/color v1.16.0
 	github.com/fsnotify/fsnotify v1.7.0
 	github.com/gofrs/flock v0.8.1
@@ -149,7 +154,11 @@ 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
+<<<<<<< HEAD
 	github.com/elastic/opentelemetry-lib v0.3.0 // indirect
+=======
+	github.com/elastic/opentelemetry-lib v0.6.1 // indirect
+>>>>>>> 1063e802d9 (Updated es infra processor and dependabot rules to include further up… (#5061))
 	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
@@ -848,10 +848,19 @@ github.com/elastic/go-windows v1.0.1/go.mod h1:FoVvqWSun28vaDQPbj2Elfc0JahhPB7WQ
 github.com/elastic/gojsonschema v1.2.1/go.mod h1:biw5eBS2Z4T02wjATMRSfecfjCmwaDPvuaqf844gLrg=
 github.com/elastic/gosigar v0.14.3 h1:xwkKwPia+hSfg9GqrCUKYdId102m9qTJIIr7egmK/uo=
 github.com/elastic/gosigar v0.14.3/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs=
+<<<<<<< HEAD
 github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.2.0 h1:hNc32QRR4oSpDWdB0CotjS57i0Cy22N4+TcUCCYP+Vs=
 github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.2.0/go.mod h1:5VmwVI4VxoS5mM16eeculPuWbjNdnCqDGvWfipi6yXs=
 github.com/elastic/opentelemetry-lib v0.3.0 h1:5wmnCqEajieIae71vh4oET0P0LX6Tb+pY09D9dDv1wA=
 github.com/elastic/opentelemetry-lib v0.3.0/go.mod h1:/kKvHbJLVo/NcKMPHI8/RZKL64fushmnRUzn+arQpjg=
+=======
+github.com/elastic/mock-es v0.0.0-20240605193845-b5546a703d6f h1:qo0Nn9G+p7HbG+CmiWwSoiKJ/cyRq59TRn9Z2PRHTi8=
+github.com/elastic/mock-es v0.0.0-20240605193845-b5546a703d6f/go.mod h1:mVdKBYYwt30xRFjCegbcURHh+3LWOCkQM33fgWbUiRI=
+github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.5.1 h1:DtRPj288iHCZPjBUfxhgHS8SWM1p2TtBadbHjZBpZck=
+github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.5.1/go.mod h1:/eTf2omfsfYQOw+nGK2NzByPMNmwq2xBFmcnREOQMBI=
+github.com/elastic/opentelemetry-lib v0.6.1 h1:Ayx82UH+oXF2222wmKTcRcq0todI6btpd8KF1tz1ZQ8=
+github.com/elastic/opentelemetry-lib v0.6.1/go.mod h1:/kKvHbJLVo/NcKMPHI8/RZKL64fushmnRUzn+arQpjg=
+>>>>>>> 1063e802d9 (Updated es infra processor and dependabot rules to include further up… (#5061))
 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
@@ -58,7 +58,11 @@ This section provides a summary of components included in the Elastic Distributi
 
 | Component | Version |
 |---|---|
+<<<<<<< HEAD
 | elasticinframetricsprocessor | v0.2.0|
+=======
+| elasticinframetricsprocessor | v0.5.1|
+>>>>>>> 1063e802d9 (Updated es infra processor and dependabot rules to include further up… (#5061))
 | attributesprocessor | v0.104.0|
 | filterprocessor | v0.104.0|
 | k8sattributesprocessor | v0.104.0|