Skip to content

Commit c86f319

Browse files
mergify[bot]dependabot[bot]ycombinator
authored
[9.1] (backport #11429) build(deps): bump github.com/elastic/go-docappender/v2 from 2.11.3 to 2.12.0 (#11446)
* build(deps): bump github.com/elastic/go-docappender/v2 from 2.11.3 to 2.12.0 (#11429) * build(deps): bump github.com/elastic/go-docappender/v2 Bumps [github.com/elastic/go-docappender/v2](https://github.com/elastic/go-docappender) from 2.11.3 to 2.12.0. - [Release notes](https://github.com/elastic/go-docappender/releases) - [Commits](elastic/go-docappender@v2.11.3...v2.12.0) --- updated-dependencies: - dependency-name: github.com/elastic/go-docappender/v2 dependency-version: 2.12.0 dependency-type: indirect update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Update EDOT go.mod * Update NOTICE.txt and/or NOTICE-fips.txt --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com> (cherry picked from commit b1d4e25) # Conflicts: # NOTICE-fips.txt # NOTICE.txt # go.mod # go.sum # internal/edot/go.mod # internal/edot/go.sum * Fixing conflicts --------- Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Shaunak Kashyap <[email protected]>
1 parent bad3e9e commit c86f319

File tree

4 files changed

+23
-23
lines changed

4 files changed

+23
-23
lines changed

‎NOTICE-fips.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18996,13 +18996,13 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/serv
1899618996

1899718997
--------------------------------------------------------------------------------
1899818998
Dependency : go.uber.org/zap
18999-
Version: v1.27.0
18999+
Version: v1.27.1
1900019000
Licence type (autodetected): MIT
1900119001
--------------------------------------------------------------------------------
1900219002

19003-
Contents of probable licence file $GOMODCACHE/go.uber.org/[email protected].0/LICENSE:
19003+
Contents of probable licence file $GOMODCACHE/go.uber.org/[email protected].1/LICENSE:
1900419004

19005-
Copyright (c) 2016-2017 Uber Technologies, Inc.
19005+
Copyright (c) 2016-2024 Uber Technologies, Inc.
1900619006

1900719007
Permission is hereby granted, free of charge, to any person obtaining a copy
1900819008
of this software and associated documentation files (the "Software"), to deal
@@ -40910,11 +40910,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]
4091040910

4091140911
--------------------------------------------------------------------------------
4091240912
Dependency : github.com/elastic/go-docappender/v2
40913-
Version: v2.11.0
40913+
Version: v2.12.0
4091440914
Licence type (autodetected): Apache-2.0
4091540915
--------------------------------------------------------------------------------
4091640916

40917-
Contents of probable licence file $GOMODCACHE/github.com/elastic/go-docappender/v2@v2.11.0/LICENSE:
40917+
Contents of probable licence file $GOMODCACHE/github.com/elastic/go-docappender/v2@v2.12.0/LICENSE:
4091840918

4091940919
Apache License
4092040920
Version 2.0, January 2004
@@ -55646,11 +55646,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5564655646

5564755647
--------------------------------------------------------------------------------
5564855648
Dependency : github.com/klauspost/compress
55649-
Version: v1.18.0
55649+
Version: v1.18.1
5565055650
Licence type (autodetected): Apache-2.0
5565155651
--------------------------------------------------------------------------------
5565255652

55653-
Contents of probable licence file $GOMODCACHE/github.com/klauspost/[email protected].0/LICENSE:
55653+
Contents of probable licence file $GOMODCACHE/github.com/klauspost/[email protected].1/LICENSE:
5565455654

5565555655
Copyright (c) 2012 The Go Authors. All rights reserved.
5565655656
Copyright (c) 2019 Klaus Post. All rights reserved.

‎NOTICE.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19629,13 +19629,13 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/serv
1962919629

1963019630
--------------------------------------------------------------------------------
1963119631
Dependency : go.uber.org/zap
19632-
Version: v1.27.0
19632+
Version: v1.27.1
1963319633
Licence type (autodetected): MIT
1963419634
--------------------------------------------------------------------------------
1963519635

19636-
Contents of probable licence file $GOMODCACHE/go.uber.org/[email protected].0/LICENSE:
19636+
Contents of probable licence file $GOMODCACHE/go.uber.org/[email protected].1/LICENSE:
1963719637

19638-
Copyright (c) 2016-2017 Uber Technologies, Inc.
19638+
Copyright (c) 2016-2024 Uber Technologies, Inc.
1963919639

1964019640
Permission is hereby granted, free of charge, to any person obtaining a copy
1964119641
of this software and associated documentation files (the "Software"), to deal
@@ -43063,11 +43063,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]
4306343063

4306443064
--------------------------------------------------------------------------------
4306543065
Dependency : github.com/elastic/go-docappender/v2
43066-
Version: v2.11.0
43066+
Version: v2.12.0
4306743067
Licence type (autodetected): Apache-2.0
4306843068
--------------------------------------------------------------------------------
4306943069

43070-
Contents of probable licence file $GOMODCACHE/github.com/elastic/go-docappender/v2@v2.11.0/LICENSE:
43070+
Contents of probable licence file $GOMODCACHE/github.com/elastic/go-docappender/v2@v2.12.0/LICENSE:
4307143071

4307243072
Apache License
4307343073
Version 2.0, January 2004
@@ -61626,11 +61626,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6162661626

6162761627
--------------------------------------------------------------------------------
6162861628
Dependency : github.com/klauspost/compress
61629-
Version: v1.18.0
61629+
Version: v1.18.1
6163061630
Licence type (autodetected): Apache-2.0
6163161631
--------------------------------------------------------------------------------
6163261632

61633-
Contents of probable licence file $GOMODCACHE/github.com/klauspost/[email protected].0/LICENSE:
61633+
Contents of probable licence file $GOMODCACHE/github.com/klauspost/[email protected].1/LICENSE:
6163461634

6163561635
Copyright (c) 2012 The Go Authors. All rights reserved.
6163661636
Copyright (c) 2019 Klaus Post. All rights reserved.

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ require (
8686
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.135.0
8787
go.opentelemetry.io/collector/receiver/nopreceiver v0.135.0
8888
go.opentelemetry.io/collector/service v0.135.0
89-
go.uber.org/zap v1.27.0
89+
go.uber.org/zap v1.27.1
9090
go.yaml.in/yaml/v3 v3.0.4
9191
golang.org/x/crypto v0.44.0
9292
golang.org/x/exp v0.0.0-20250811191247-51f88131bc50
@@ -337,7 +337,7 @@ require (
337337
github.com/edsrzf/mmap-go v1.2.0 // indirect
338338
github.com/elastic/bayeux v1.0.5 // indirect
339339
github.com/elastic/go-concert v0.3.1 // indirect
340-
github.com/elastic/go-docappender/v2 v2.11.0 // indirect
340+
github.com/elastic/go-docappender/v2 v2.12.0 // indirect
341341
github.com/elastic/go-freelru v0.16.0 // indirect
342342
github.com/elastic/go-grok v0.3.1 // indirect
343343
github.com/elastic/go-lumber v0.1.2-0.20220819171948-335fde24ea0f // indirect
@@ -468,7 +468,7 @@ require (
468468
github.com/julienschmidt/httprouter v1.3.0 // indirect
469469
github.com/kamstrup/intmap v0.5.1 // indirect
470470
github.com/klauspost/asmfmt v1.3.2 // indirect
471-
github.com/klauspost/compress v1.18.0 // indirect
471+
github.com/klauspost/compress v1.18.1 // indirect
472472
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
473473
github.com/knadh/koanf/providers/confmap v1.0.0 // indirect
474474
github.com/knadh/koanf/v2 v2.3.0 // indirect

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -503,8 +503,8 @@ github.com/elastic/fsnotify v1.6.1-0.20240920222514-49f82bdbc9e3 h1:UyNbxdkQiSfy
503503
github.com/elastic/fsnotify v1.6.1-0.20240920222514-49f82bdbc9e3/go.mod h1:DAsKqylc/16NDcfdk8dN5axVtSOsQwgP2kV+NV5xPDE=
504504
github.com/elastic/go-concert v0.3.1 h1:dqtq2+xA8w7BZunI7j3Hs43CjWod7/nNRD8ByPx4YMs=
505505
github.com/elastic/go-concert v0.3.1/go.mod h1:bQ/sGkdR0I8IdzLuxDcrczc+caloItvAqw23jISl9sQ=
506-
github.com/elastic/go-docappender/v2 v2.11.0 h1:Sr6vKHff26mceWoFjkHFcFOTI4N6lIpyhY6snidq7Pg=
507-
github.com/elastic/go-docappender/v2 v2.11.0/go.mod h1:uSM4ZspehKGUjTEXaSRg5PmcOywMHJNECGbPSkINkJ0=
506+
github.com/elastic/go-docappender/v2 v2.12.0 h1:4H5Ale36xmlSzJ8B4fpjNkvDcihEO22NnOFpJxoR/L0=
507+
github.com/elastic/go-docappender/v2 v2.12.0/go.mod h1:TH6zt+utuXQ8wm+tor0zcrKlZFuLUzXo8UMaSvOhvis=
508508
github.com/elastic/go-elasticsearch/v8 v8.19.0 h1:VmfBLNRORY7RZL+9hTxBD97ehl9H8Nxf2QigDh6HuMU=
509509
github.com/elastic/go-elasticsearch/v8 v8.19.0/go.mod h1:F3j9e+BubmKvzvLjNui/1++nJuJxbkhHefbaT0kFKGY=
510510
github.com/elastic/go-freelru v0.16.0 h1:gG2HJ1WXN2tNl5/p40JS/l59HjvjRhjyAa+oFTRArYs=
@@ -968,8 +968,8 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
968968
github.com/klauspost/asmfmt v1.3.2 h1:4Ri7ox3EwapiOjCki+hw14RyKk201CN4rzyCJRFLpK4=
969969
github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE=
970970
github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
971-
github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
972-
github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
971+
github.com/klauspost/compress v1.18.1 h1:bcSGx7UbpBqMChDtsF28Lw6v/G94LPrrbMbdC3JH2co=
972+
github.com/klauspost/compress v1.18.1/go.mod h1:ZQFFVG+MdnR0P+l6wpXgIL4NTtwiKIdBnrBd8Nrxr+0=
973973
github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
974974
github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
975975
github.com/knadh/koanf/maps v0.1.2 h1:RBfmAW5CnZT+PJ1CVc1QSJKf4Xu9kxfQgYVQSu8hpbo=
@@ -1877,8 +1877,8 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
18771877
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
18781878
go.uber.org/ratelimit v0.3.1 h1:K4qVE+byfv/B3tC+4nYWP7v/6SimcO7HzHekoMNBma0=
18791879
go.uber.org/ratelimit v0.3.1/go.mod h1:6euWsTB6U/Nb3X++xEUXA8ciPJvr19Q/0h1+oDcJhRk=
1880-
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
1881-
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
1880+
go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc=
1881+
go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
18821882
go.uber.org/zap/exp v0.3.0 h1:6JYzdifzYkGmTdRR59oYH+Ng7k49H9qVpWwNSsGJj3U=
18831883
go.uber.org/zap/exp v0.3.0/go.mod h1:5I384qq7XGxYyByIhHm6jg5CHkGY0nsTfbDLgDDlgJQ=
18841884
go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=

0 commit comments

Comments
 (0)