@@ -489,15 +489,8 @@ github.com/elastic/fsnotify v1.6.1-0.20240920222514-49f82bdbc9e3 h1:UyNbxdkQiSfy
489
489
github.com/elastic/fsnotify v1.6.1-0.20240920222514-49f82bdbc9e3 /go.mod h1:DAsKqylc/16NDcfdk8dN5axVtSOsQwgP2kV+NV5xPDE =
490
490
github.com/elastic/go-concert v0.3.0 h1:Y66JFn3ENndpHErOhTASu8/Fz1SSsLZicPufCmvQD60 =
491
491
github.com/elastic/go-concert v0.3.0 /go.mod h1:UWt1MB5HxxZ85hKynLaYl/AaLIKFx0WiBP2uJSRfduA =
492
- <<<<<<< HEAD
493
- github.com/elastic/go-docappender/v2 v2.4.0 h1:3ouOEB7V4IDgjZ0YAggzDgMK63QFfQ9HcJWSyAZGRzY =
494
- github.com/elastic/go-docappender/v2 v2.4.0 /go.mod h1:Zm0mndWB4sS/9pgjMKdP0vOPJ1Cvkjy56B2D9DnGLgQ =
495
- github.com/elastic/go-elasticsearch/v7 v7.17.10 h1:TCQ8i4PmIJuBunvBS6bwT2ybzVFxxUhhltAs3Gyu1yo =
496
- github.com/elastic/go-elasticsearch/v7 v7.17.10 /go.mod h1:OJ4wdbtDNk5g503kvlHLyErCgQwwzmDtaFC4XyOxXA4 =
497
- =======
498
492
github.com/elastic/go-docappender/v2 v2.8.0 h1:gaqts+GyCb1sM24CjFT+gZMTsTH8JFHTu7GyzB45xTs =
499
493
github.com/elastic/go-docappender/v2 v2.8.0 /go.mod h1:xoTA2/HUjnIgF7acxxjfYaT7KE3nFhBQ5ZkmN0edE5o =
500
- >>>>>>> b2c19df3e ([Chore] Update otel components to v0.127.0 /v0.121.0 (#7686))
501
494
github.com/elastic/go-elasticsearch/v8 v8.17.1 h1:bOXChDoCMB4TIwwGqKd031U8OXssmWLT3UrAr9EGs3Q =
502
495
github.com/elastic/go-elasticsearch/v8 v8.17.1 /go.mod h1:MVJCtL+gJJ7x5jFeUmA20O7rvipX8GcQmo5iBcmaJn4 =
503
496
github.com/elastic/go-freelru v0.16.0 h1:gG2HJ1WXN2tNl5/p40JS/l59HjvjRhjyAa+oFTRArYs =
@@ -758,8 +751,9 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
758
751
github.com/google/go-cmp v0.5.5 /go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE =
759
752
github.com/google/go-cmp v0.5.8 /go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY =
760
753
github.com/google/go-cmp v0.5.9 /go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY =
761
- github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI =
762
754
github.com/google/go-cmp v0.6.0 /go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY =
755
+ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8 =
756
+ github.com/google/go-cmp v0.7.0 /go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU =
763
757
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8 =
764
758
github.com/google/go-querystring v1.1.0 /go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU =
765
759
github.com/google/gofuzz v1.0.0 /go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg =
@@ -796,12 +790,12 @@ github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
796
790
github.com/google/uuid v1.3.1 /go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo =
797
791
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0 =
798
792
github.com/google/uuid v1.6.0 /go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo =
799
- github.com/googleapis/enterprise-certificate-proxy v0.3.4 h1:XYIDZApgAnrN1c855gTgghdIA6Stxb52D5RnLI1SLyw =
800
- github.com/googleapis/enterprise-certificate-proxy v0.3.4 /go.mod h1:YKe7cfqYXjKGpGvmSg28/fFvhNzinZQm8DGnaburhGA =
793
+ github.com/googleapis/enterprise-certificate-proxy v0.3.5 h1:VgzTY2jogw3xt39CusEnFJWm7rlsq5yL5q9XdLOuP5g =
794
+ github.com/googleapis/enterprise-certificate-proxy v0.3.5 /go.mod h1:MkHOF77EYAE7qfSuSS9PU6g4Nt4e11cnsDUowfwewLA =
801
795
github.com/googleapis/gax-go/v2 v2.0.4 /go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg =
802
796
github.com/googleapis/gax-go/v2 v2.0.5 /go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk =
803
- github.com/googleapis/gax-go/v2 v2.14.0 h1:f+jMrjBPl+DL9nI4IQzLUxMq7XrAqFYB7hBPqMNIe8o =
804
- github.com/googleapis/gax-go/v2 v2.14.0 /go.mod h1:lhBCnjdLrWRaPvLWhmc8IS24m9mr07qSYnHncrgo+zk =
797
+ github.com/googleapis/gax-go/v2 v2.14.1 h1:hb0FFeiPaQskmvakKu5EbCbpntQn48jyHuvrkurSS/Q =
798
+ github.com/googleapis/gax-go/v2 v2.14.1 /go.mod h1:Hb/NubMaVM88SrNkvl8X/o8XWwDJEPqouaLeN2IUxoA =
805
799
github.com/googleapis/gnostic v0.4.1 /go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg =
806
800
github.com/gophercloud/gophercloud v1.14.1 h1:DTCNaTVGl8/cFu58O1JwWgis9gtISAFONqpMKNg/Vpw =
807
801
github.com/gophercloud/gophercloud v1.14.1 /go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM =
@@ -978,8 +972,8 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI
978
972
github.com/kisielk/gotool v1.0.0 /go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck =
979
973
github.com/klauspost/asmfmt v1.3.2 h1:4Ri7ox3EwapiOjCki+hw14RyKk201CN4rzyCJRFLpK4 =
980
974
github.com/klauspost/asmfmt v1.3.2 /go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE =
981
- github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc =
982
- github.com/klauspost/compress v1.17.11 /go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0 =
975
+ github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo =
976
+ github.com/klauspost/compress v1.18.0 /go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ =
983
977
github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM =
984
978
github.com/klauspost/cpuid/v2 v2.2.8 /go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws =
985
979
github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs =
@@ -1783,15 +1777,10 @@ go.opentelemetry.io/contrib/propagators/b3 v1.34.0 h1:9pQdCEvV/6RWQmag94D6rhU+A4
1783
1777
go.opentelemetry.io/contrib/propagators/b3 v1.34.0 /go.mod h1:FwM71WS8i1/mAK4n48t0KU6qUS/OZRBgDrHZv3RlJ+w =
1784
1778
go.opentelemetry.io/contrib/zpages v0.59.0 h1:t0H5zUy8fifIhRuVwm2FrA/D70Kk10SSpAEvvbaNscw =
1785
1779
go.opentelemetry.io/contrib/zpages v0.59.0 /go.mod h1:9wo+yUPvHnBQEzoHJ8R3nA/Q5rkef7HjtLlSFI0Tgrc =
1786
- <<<<<<< HEAD
1787
- go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY =
1788
- go.opentelemetry.io/otel v1.34.0 /go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI =
1789
- =======
1790
1780
go.opentelemetry.io/ebpf-profiler v0.0.0-20250212075250-7bf12d3f962f h1:DqRQ7JaRjf3TwWwfwHIvsBB/aLUs+kgrX+MrAIllALI =
1791
1781
go.opentelemetry.io/ebpf-profiler v0.0.0-20250212075250-7bf12d3f962f /go.mod h1:hfAVBjRN6FZjSgZUBsNzvRDJWlS46R5Y0SGVr4Jl86s =
1792
1782
go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ =
1793
1783
go.opentelemetry.io/otel v1.35.0 /go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y =
1794
- >>>>>>> b2c19df3e ([Chore] Update otel components to v0.127.0 /v0.121.0 (#7686))
1795
1784
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.10.0 h1:5dTKu4I5Dn4P2hxyW3l3jTaZx9ACgg0ECos1eAVrheY =
1796
1785
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.10.0 /go.mod h1:P5HcUI8obLrCCmM3sbVBohZFH34iszk/+CPWuakZWL8 =
1797
1786
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.10.0 h1:q/heq5Zh8xV1+7GoMGJpTxM2Lhq5+bFxB29tshuRuw0 =
@@ -1816,16 +1805,16 @@ go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.34.0 h1:jBpDk4HAUsrnVO1
1816
1805
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.34.0 /go.mod h1:H9LUIM1daaeZaz91vZcfeM0fejXPmgCYE8ZhzqfJuiU =
1817
1806
go.opentelemetry.io/otel/log v0.10.0 h1:1CXmspaRITvFcjA4kyVszuG4HjA61fPDxMb7q3BuyF0 =
1818
1807
go.opentelemetry.io/otel/log v0.10.0 /go.mod h1:PbVdm9bXKku/gL0oFfUF4wwsQsOPlpo4VEqjvxih+FM =
1819
- go.opentelemetry.io/otel/metric v1.34 .0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ =
1820
- go.opentelemetry.io/otel/metric v1.34 .0 /go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE =
1821
- go.opentelemetry.io/otel/sdk v1.34 .0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A =
1822
- go.opentelemetry.io/otel/sdk v1.34 .0 /go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU =
1808
+ go.opentelemetry.io/otel/metric v1.35 .0 h1:0znxYu2SNyuMSQT4Y9WDWej0VpcsxkuklLa4/siN90M =
1809
+ go.opentelemetry.io/otel/metric v1.35 .0 /go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE =
1810
+ go.opentelemetry.io/otel/sdk v1.35 .0 h1:iPctf8iprVySXSKJffSS79eOjl9pvxV9ZqOWT0QejKY =
1811
+ go.opentelemetry.io/otel/sdk v1.35 .0 /go.mod h1:+ga1bZliga3DxJ3CQGg3updiaAJoNECOgJREo9KHGQg =
1823
1812
go.opentelemetry.io/otel/sdk/log v0.10.0 h1:lR4teQGWfeDVGoute6l0Ou+RpFqQ9vaPdrNJlST0bvw =
1824
1813
go.opentelemetry.io/otel/sdk/log v0.10.0 /go.mod h1:A+V1UTWREhWAittaQEG4bYm4gAZa6xnvVu+xKrIRkzo =
1825
- go.opentelemetry.io/otel/sdk/metric v1.34 .0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk =
1826
- go.opentelemetry.io/otel/sdk/metric v1.34 .0 /go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w =
1827
- go.opentelemetry.io/otel/trace v1.34 .0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k =
1828
- go.opentelemetry.io/otel/trace v1.34 .0 /go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE =
1814
+ go.opentelemetry.io/otel/sdk/metric v1.35 .0 h1:1RriWBmCKgkeHEhM7a2uMjMUfP7MsOF5JpUCaEqEI9o =
1815
+ go.opentelemetry.io/otel/sdk/metric v1.35 .0 /go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstFnhW0BidkR+gL+qN+w =
1816
+ go.opentelemetry.io/otel/trace v1.35 .0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs =
1817
+ go.opentelemetry.io/otel/trace v1.35 .0 /go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc =
1829
1818
go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4 =
1830
1819
go.opentelemetry.io/proto/otlp v1.5.0 /go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4 =
1831
1820
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca h1:VdD38733bfYv5tUZwEIskMM93VanwNIi5bIKnDrJdEY =
0 commit comments