Skip to content

Commit 804526f

Browse files
authored
Merge branch 'main' into fix/mdatagen-deprecated-metrics
2 parents 60b6888 + 5e41fb5 commit 804526f

File tree

79 files changed

+119
-119
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+119
-119
lines changed

cmd/mdatagen/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ require (
4040
github.com/davecgh/go-spew v1.1.1 // indirect
4141
github.com/go-logr/logr v1.4.3 // indirect
4242
github.com/go-logr/stdr v1.2.2 // indirect
43-
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
43+
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
4444
github.com/gobwas/glob v0.2.3 // indirect
4545
github.com/google/uuid v1.6.0 // indirect
4646
github.com/hashicorp/go-version v1.8.0 // indirect

cmd/mdatagen/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/otelcorecol/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ require (
4545
github.com/go-logr/logr v1.4.3 // indirect
4646
github.com/go-logr/stdr v1.2.2 // indirect
4747
github.com/go-ole/go-ole v1.2.6 // indirect
48-
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
48+
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
4949
github.com/gobwas/glob v0.2.3 // indirect
5050
github.com/golang/snappy v1.0.0 // indirect
5151
github.com/google/go-tpm v0.9.8 // indirect

cmd/otelcorecol/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/configgrpc/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ require (
3535
github.com/fsnotify/fsnotify v1.9.0 // indirect
3636
github.com/go-logr/logr v1.4.3 // indirect
3737
github.com/go-logr/stdr v1.2.2 // indirect
38-
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
38+
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
3939
github.com/gobwas/glob v0.2.3 // indirect
4040
github.com/golang/snappy v0.0.4 // indirect
4141
github.com/google/go-tpm v0.9.8 // indirect

config/configgrpc/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/confighttp/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ require (
4444
github.com/fsnotify/fsnotify v1.9.0 // indirect
4545
github.com/go-logr/logr v1.4.3 // indirect
4646
github.com/go-logr/stdr v1.2.2 // indirect
47-
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
47+
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
4848
github.com/gobwas/glob v0.2.3 // indirect
4949
github.com/google/go-tpm v0.9.8 // indirect
5050
github.com/google/uuid v1.6.0 // indirect

config/confighttp/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/confighttp/xconfighttp/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ require (
2020
github.com/fsnotify/fsnotify v1.9.0 // indirect
2121
github.com/go-logr/logr v1.4.3 // indirect
2222
github.com/go-logr/stdr v1.2.2 // indirect
23-
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
23+
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
2424
github.com/gobwas/glob v0.2.3 // indirect
2525
github.com/golang/snappy v1.0.0 // indirect
2626
github.com/google/go-tpm v0.9.8 // indirect

config/confighttp/xconfighttp/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)