@@ -200,24 +200,13 @@ require (
200200 github.com/armon/go-radix v1.0.0 // indirect
201201 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
202202 github.com/aws/aws-msk-iam-sasl-signer-go v1.0.4 // indirect
203- <<<<<<< HEAD
204- github.com/aws/aws-sdk-go-v2 v1.39.4 // indirect
205- github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.2 // indirect
206- github.com/aws/aws-sdk-go-v2/config v1.31.15 // indirect
207- github.com/aws/aws-sdk-go-v2/credentials v1.18.19 // indirect
208- github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.11 // indirect
209- github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.11 // indirect
210- github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.11 // indirect
211- =======
212203 github.com/aws/aws-sdk-go-v2 v1.40.0 // indirect
213204 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.3 // indirect
214205 github.com/aws/aws-sdk-go-v2/config v1.32.1 // indirect
215206 github.com/aws/aws-sdk-go-v2/credentials v1.19.1 // indirect
216207 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.14 // indirect
217- github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.20.11 // indirect
218208 github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14 // indirect
219209 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14 // indirect
220- >>>>>>> ee439f134 (Upgrade otel to 0.141.0 and 1.37.0 (#11671))
221210 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
222211 github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.14 // indirect
223212 github.com/aws/aws-sdk-go-v2/service/apigateway v1.31.3 // indirect
@@ -468,7 +457,7 @@ require (
468457 github.com/mdlayher/socket v0.4.1 // indirect
469458 github.com/mdlayher/vsock v1.2.1 // indirect
470459 github.com/meraki/dashboard-api-go/v3 v3.0.9 // indirect
471- github.com/microsoft/go-mssqldb v1.9.3 // indirect
460+ github.com/microsoft/go-mssqldb v1.9.4 // indirect
472461 github.com/microsoft/wmi v0.34.0 // indirect
473462 github.com/miekg/dns v1.1.68 // indirect
474463 github.com/mileusna/useragent v1.3.5 // indirect
@@ -497,86 +486,6 @@ require (
497486 github.com/oklog/ulid v1.3.1 // indirect
498487 github.com/onsi/ginkgo v1.16.5 // indirect
499488 github.com/open-telemetry/opamp-go v0.22.0 // indirect
500- <<<<<<< HEAD
501- github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.139.0 // indirect
502- github.com/open-telemetry/opentelemetry-collector-contrib/connector/signaltometricsconnector v0.139.0 // indirect
503- github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.139.0 // indirect
504- github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.139.0 // indirect
505- github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.139.0 // indirect
506- github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.139.0 // indirect
507- github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.139.0 // indirect
508- github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.139.0 // indirect
509- github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.139.0 // indirect
510- github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.139.0 // indirect
511- github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckv2extension v0.139.0 // indirect
512- github.com/open-telemetry/opentelemetry-collector-contrib/extension/k8sleaderelector v0.139.0 // indirect
513- github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.139.0 // indirect
514- github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.139.0 // indirect
515- github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.139.0 // indirect
516- github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.139.0 // indirect
517- github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.139.0 // indirect
518- github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.139.0 // indirect
519- github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.139.0 // indirect
520- github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.139.0 // indirect
521- github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.139.0 // indirect
522- github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.139.0 // indirect
523- github.com/open-telemetry/opentelemetry-collector-contrib/internal/gopsutilenv v0.139.0 // indirect
524- github.com/open-telemetry/opentelemetry-collector-contrib/internal/healthcheck v0.139.0 // indirect
525- github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.139.0 // indirect
526- github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.139.0 // indirect
527- github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.139.0 // indirect
528- github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.139.0 // indirect
529- github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.139.0 // indirect
530- github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.139.0 // indirect
531- github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlquery v0.139.0 // indirect
532- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.139.0 // indirect
533- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils v0.139.0 // indirect
534- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.139.0 // indirect
535- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/configkafka v0.139.0 // indirect
536- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/topic v0.139.0 // indirect
537- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.139.0 // indirect
538- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.139.0 // indirect
539- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/sampling v0.139.0 // indirect
540- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.139.0 // indirect
541- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.139.0 // indirect
542- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.139.0 // indirect
543- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.139.0 // indirect
544- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.139.0 // indirect
545- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.139.0 // indirect
546- github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.139.0 // indirect
547- github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.139.0 // indirect
548- github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.139.0 // indirect
549- github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.139.0 // indirect
550- github.com/open-telemetry/opentelemetry-collector-contrib/processor/geoipprocessor v0.139.0 // indirect
551- github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.139.0 // indirect
552- github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.139.0 // indirect
553- github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.139.0 // indirect
554- github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.139.0 // indirect
555- github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.139.0 // indirect
556- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.139.0 // indirect
557- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.139.0 // indirect
558- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.139.0 // indirect
559- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.139.0 // indirect
560- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver v0.139.0 // indirect
561- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/iisreceiver v0.139.0 // indirect
562- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.139.0 // indirect
563- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.139.0 // indirect
564- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.139.0 // indirect
565- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.139.0 // indirect
566- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.139.0 // indirect
567- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.139.0 // indirect
568- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.139.0 // indirect
569- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mysqlreceiver v0.139.0 // indirect
570- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver v0.139.0 // indirect
571- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver v0.139.0 // indirect
572- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.139.0 // indirect
573- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.139.0 // indirect
574- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.139.0 // indirect
575- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver v0.139.0 // indirect
576- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.139.0 // indirect
577- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.139.0 // indirect
578- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.139.0 // indirect
579- =======
580489 github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.141.0 // indirect
581490 github.com/open-telemetry/opentelemetry-collector-contrib/connector/signaltometricsconnector v0.141.0 // indirect
582491 github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.141.0 // indirect
@@ -585,15 +494,12 @@ require (
585494 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.141.0 // indirect
586495 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.141.0 // indirect
587496 github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.141.0 // indirect
588- github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.141.0 // indirect
589- github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/awslogsencodingextension v0.141.0 // indirect
590497 github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.141.0 // indirect
591498 github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.141.0 // indirect
592499 github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckv2extension v0.141.0 // indirect
593500 github.com/open-telemetry/opentelemetry-collector-contrib/extension/k8sleaderelector v0.141.0 // indirect
594501 github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.141.0 // indirect
595502 github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.141.0 // indirect
596- github.com/open-telemetry/opentelemetry-collector-contrib/extension/opampcustommessages v0.141.0 // indirect
597503 github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.141.0 // indirect
598504 github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.141.0 // indirect
599505 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.141.0 // indirect
@@ -636,7 +542,6 @@ require (
636542 github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.141.0 // indirect
637543 github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.141.0 // indirect
638544 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.141.0 // indirect
639- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awss3receiver v0.141.0 // indirect
640545 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.141.0 // indirect
641546 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.141.0 // indirect
642547 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.141.0 // indirect
@@ -659,7 +564,6 @@ require (
659564 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.141.0 // indirect
660565 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.141.0 // indirect
661566 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.141.0 // indirect
662- >>>>>>> ee439f134 (Upgrade otel to 0.141.0 and 1.37.0 (#11671))
663567 github.com/opencontainers/go-digest v1.0.0 // indirect
664568 github.com/opencontainers/image-spec v1.1.1 // indirect
665569 github.com/openshift/api v3.9.0+incompatible // indirect
0 commit comments