@@ -7,6 +7,7 @@ replace github.com/elastic/elastic-agent => ../../
77require (
88 github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251119204152-c728c08086a3
99 github.com/elastic/elastic-agent v0.0.0-00010101000000-000000000000
10+ <<<<<<< HEAD
1011 github.com/elastic/elastic-agent-libs v0.26.1
1112 github.com/elastic/opentelemetry-collector-components/connector/elasticapmconnector v0.8.0
1213 github.com/elastic/opentelemetry-collector-components/connector/profilingmetricsconnector v0.1.0
@@ -44,6 +45,47 @@ require (
4445 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver v0.137.0
4546 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.137.0
4647 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.137.0
48+ =======
49+ github.com/elastic/elastic-agent-libs v0.26.2
50+ github.com/elastic/opentelemetry-collector-components/connector/elasticapmconnector v0.20.0
51+ github.com/elastic/opentelemetry-collector-components/connector/profilingmetricsconnector v0.20.0
52+ github.com/elastic/opentelemetry-collector-components/extension/apikeyauthextension v0.22.0
53+ github.com/elastic/opentelemetry-collector-components/extension/apmconfigextension v0.20.0
54+ github.com/elastic/opentelemetry-collector-components/processor/elasticapmprocessor v0.21.0
55+ github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.20.0
56+ github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor v0.20.0
57+ github.com/elastic/opentelemetry-collector-components/receiver/elasticapmintakereceiver v0.21.0
58+ github.com/gofrs/uuid/v5 v5.4.0
59+ github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.139.0
60+ github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.139.0
61+ github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.139.0
62+ github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.139.0
63+ github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/awslogsencodingextension v0.139.0
64+ github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.139.0
65+ github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.139.0
66+ github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckv2extension v0.139.0
67+ github.com/open-telemetry/opentelemetry-collector-contrib/extension/k8sleaderelector v0.139.0
68+ github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.139.0
69+ github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.139.0
70+ github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.139.0
71+ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.139.0
72+ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awss3receiver v0.139.0
73+ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.139.0
74+ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/iisreceiver v0.139.0
75+ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.139.0
76+ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.139.0
77+ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.139.0
78+ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.139.0
79+ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mysqlreceiver v0.139.0
80+ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver v0.139.0
81+ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver v0.139.0
82+ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.139.0
83+ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.139.0
84+ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.139.0
85+ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver v0.139.0
86+ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.139.0
87+ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.139.0
88+ >>>>>>> 9c0f97ce2 (build(deps): bump github.com/elastic/elastic-agent-libs from 0.26.1 to 0.26.2 (#11353))
4789 github.com/spf13/cobra v1.10.1
4890 github.com/spf13/pflag v1.0.9
4991 github.com/stretchr/testify v1.11.1
@@ -295,10 +337,16 @@ require (
295337 github.com/elastic/gosigar v0.14.3 // indirect
296338 github.com/elastic/lunes v0.1.0 // indirect
297339 github.com/elastic/mito v1.23.0 // indirect
340+ <<<<<<< HEAD
298341 github.com/elastic/opentelemetry-collector-components/internal/sharedcomponent v0.0.0-20250220025958-386ba0c4bced // indirect
299342 github.com/elastic/opentelemetry-collector-components/processor/lsmintervalprocessor v0.8.0 // indirect
300343 github.com/elastic/opentelemetry-lib v0.24.0 // indirect
301344 github.com/elastic/pkcs8 v1.0.0 // indirect
345+ =======
346+ github.com/elastic/opentelemetry-collector-components/internal/sharedcomponent v0.0.0-20251113000200-a6f7cddc8520 // indirect
347+ github.com/elastic/opentelemetry-collector-components/processor/lsmintervalprocessor v0.20.0 // indirect
348+ github.com/elastic/opentelemetry-lib v0.26.0 // indirect
349+ >>>>>>> 9c0f97ce2 (build(deps): bump github.com/elastic/elastic-agent-libs from 0.26.1 to 0.26.2 (#11353))
302350 github.com/elastic/sarama v1.19.1-0.20250603175145-7672917f26b6 // indirect
303351 github.com/emicklei/go-restful/v3 v3.12.1 // indirect
304352 github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
0 commit comments