Skip to content

Commit

Permalink
Finish missing 117->119 Collector upgrades (#286)
Browse files Browse the repository at this point in the history
Follow-up to #285, did not capture full extent of required changes in
that PR. Needed to run additional `make genotelarrowcol` command and
commit result.
  • Loading branch information
drewrelmas authored Feb 5, 2025
1 parent d05feb3 commit d6d2822
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 30 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

## Unreleased

- Upgrade to v0.119.0 of collector dependencies. [#285](https://github.com/open-telemetry/otel-arrow/pull/285)
- Upgrade to v0.119.0 of collector dependencies. [#285](https://github.com/open-telemetry/otel-arrow/pull/285), [#286](https://github.com/open-telemetry/otel-arrow/pull/286)

## [0.32.0](https://github.com/open-telemetry/otel-arrow/releases/tag/v0.32.0) - 2025-01-24

Expand Down
20 changes: 10 additions & 10 deletions collector/cmd/otelarrowcol/components.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions collector/cmd/otelarrowcol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ require (
github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor v0.32.0
go.opentelemetry.io/collector/component v0.119.0
go.opentelemetry.io/collector/confmap v1.25.0
go.opentelemetry.io/collector/confmap/provider/envprovider v1.23.0
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.23.0
go.opentelemetry.io/collector/confmap/provider/httpprovider v1.23.0
go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.23.0
go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.23.0
go.opentelemetry.io/collector/confmap/provider/envprovider v1.25.0
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.0
go.opentelemetry.io/collector/confmap/provider/httpprovider v1.25.0
go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.25.0
go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.25.0
go.opentelemetry.io/collector/connector v0.119.0
go.opentelemetry.io/collector/exporter v0.119.0
go.opentelemetry.io/collector/exporter/debugexporter v0.119.0
Expand Down
20 changes: 10 additions & 10 deletions collector/cmd/otelarrowcol/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1137,16 +1137,16 @@ go.opentelemetry.io/collector/config/configtls v1.25.0 h1:x915Us8mhYWGB025LBMH8L
go.opentelemetry.io/collector/config/configtls v1.25.0/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms=
go.opentelemetry.io/collector/confmap v1.25.0 h1:dLqd6hF4JqcDHl5GWWhc2jXsHs3hkq3KPvU/2Nw5aN4=
go.opentelemetry.io/collector/confmap v1.25.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec=
go.opentelemetry.io/collector/confmap/provider/envprovider v1.23.0 h1:b1aZxceRYYH1wXqqVHYZpepiVKYy8WJ27NHq/KQFQJs=
go.opentelemetry.io/collector/confmap/provider/envprovider v1.23.0/go.mod h1:c1zdel/NZJumOWY8RhKfOuF/uxihNxQrJzBQcnY0HFw=
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.23.0 h1:2CwU9PZLCP76iNTk6vP1CN3BA1C9OnnebpCE0WQf6F4=
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.23.0/go.mod h1:tDUen3bEdWlgJtJEc2OrNV6sTfR/QkImyAFlxUXcplY=
go.opentelemetry.io/collector/confmap/provider/httpprovider v1.23.0 h1:CdGl8CI5rnbAhNIJwisCKvKEiqOKWTZqnsQ2WqcCPs8=
go.opentelemetry.io/collector/confmap/provider/httpprovider v1.23.0/go.mod h1:lvljQaUjATZhFghYNPGNjIO3lsedzv7lOlkQfOdiung=
go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.23.0 h1:LhAmpmjCVSmiusk0lymvSxkYPy1praMHwGhNdnUJVFw=
go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.23.0/go.mod h1:89KFhIqvcjibD2yduEHmkl9w0fzVQgOh4NP0p293reU=
go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.23.0 h1:ZaK8+EcQxlYZZgJn7ew700AUhH9CpXA3VBn46OHHEHk=
go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.23.0/go.mod h1:WrlXU+lshUTmsgyacD7jijs0Nh85Xf0xU/0sqtkHDNs=
go.opentelemetry.io/collector/confmap/provider/envprovider v1.25.0 h1:r4nyEXzs+1ZaemXX7bo2pniIqUZxoFKv0Q1Y7UKkkeY=
go.opentelemetry.io/collector/confmap/provider/envprovider v1.25.0/go.mod h1:uIRrCsNI9hx6/AehW0MpB0oEPzRt2QIn6rCbFQkBbbQ=
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.0 h1:0Bbay2ow6eQVKMxuota2i1/iIMRhE988hxoY/67Zfqw=
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.0/go.mod h1:5xaAHjqx9mlcXxDCeUrZXkEfWk9suMqMKspK41XNelc=
go.opentelemetry.io/collector/confmap/provider/httpprovider v1.25.0 h1:eBuy2cxEuRRe5xhQjz+0YqCtMEa6pUUXtEUeZ1+dqSw=
go.opentelemetry.io/collector/confmap/provider/httpprovider v1.25.0/go.mod h1:tAn9Ahbs+y/lBv0etEnVg401hhiHGIXneALyD2I3qIs=
go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.25.0 h1:kAQB0n/ZIBFjMbnV3sNYlA2fAouPIKidjEd5pnGlzCM=
go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.25.0/go.mod h1:fd23s5QAsqX43mk20ECj6hn6jBogfPxXlZ7EQuCpWic=
go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.25.0 h1:P0F4ys5mxyoo9Bl1uNQc9tDQHUcjc6UiSdQWnHzAod8=
go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.25.0/go.mod h1:3+woatuB5xT10fnmHu5DPujf/rBVi2sntNu2cjqFtYs=
go.opentelemetry.io/collector/connector v0.119.0 h1:TWEVa2Iu+YOW/BuqNAoX0iesv4ygocb9v6GKtZEGsSw=
go.opentelemetry.io/collector/connector v0.119.0/go.mod h1:4p/m2G2acL03RjhdeTJpo6afHFnfBU8E+eUxyrz7qd4=
go.opentelemetry.io/collector/connector/connectortest v0.119.0 h1:jfkxP4jrd+CkyM0SnOrwiSiOW0xyahsyUjWqMwVBbBI=
Expand Down
8 changes: 7 additions & 1 deletion collector/cmd/otelarrowcol/main.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/pierrec/lz4 v2.0.5+incompatible
github.com/stretchr/testify v1.10.0
github.com/zeebo/assert v1.3.0
go.opentelemetry.io/collector/config/configtelemetry v0.117.0
go.opentelemetry.io/collector/config/configtelemetry v0.119.0
go.opentelemetry.io/collector/pdata v1.23.0
go.opentelemetry.io/otel v1.33.0
go.opentelemetry.io/otel/metric v1.33.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
go.opentelemetry.io/collector/config/configtelemetry v0.117.0 h1:xsMfc89VByIF2fJzWuxs/2eqy44DWfNBAysReG4TAr8=
go.opentelemetry.io/collector/config/configtelemetry v0.117.0/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE=
go.opentelemetry.io/collector/config/configtelemetry v0.119.0 h1:gAgMUEVXZKgpASxOrhS55DyA/aYatq0U6gitZI8MLXw=
go.opentelemetry.io/collector/config/configtelemetry v0.119.0/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE=
go.opentelemetry.io/collector/pdata v1.23.0 h1:tEk0dkfB8RdSukoOMfEa8duB938gfZowdfRkrJxGDrw=
go.opentelemetry.io/collector/pdata v1.23.0/go.mod h1:I2jggpBMiO8A+7TXhzNpcJZkJtvi1cU0iVNIi+6bc+o=
go.opentelemetry.io/otel v1.33.0 h1:/FerN9bax5LoK51X/sI0SVYrjSE0/yUL7DpxW4K3FWw=
Expand Down

0 comments on commit d6d2822

Please sign in to comment.