Skip to content

Commit

Permalink
Merge pull request #29616 from dmitryax/merge-release-branch-in-main
Browse files Browse the repository at this point in the history
Merge release/v0.90.x into main
  • Loading branch information
dmitryax authored Dec 1, 2023
2 parents b68be41 + 2e1bc39 commit 7fc2229
Show file tree
Hide file tree
Showing 474 changed files with 8,680 additions and 8,674 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ If you are looking for developer-facing changes, check out [CHANGELOG-API.md](./

<!-- next version -->

## v0.90.1

### 🧰 Bug fixes 🧰

- `exporters`: Upgrade core dependency to remove noisy "Exporting finished" log message in exporters. (#29612)

## v0.90.0

### 🛑 Breaking changes 🛑
Expand Down
478 changes: 239 additions & 239 deletions cmd/configschema/go.mod

Large diffs are not rendered by default.

128 changes: 64 additions & 64 deletions cmd/configschema/go.sum

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

2 changes: 1 addition & 1 deletion cmd/githubgen/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.20

require (
github.com/google/go-github/v53 v53.2.0
go.opentelemetry.io/collector/confmap v0.90.0
go.opentelemetry.io/collector/confmap v0.90.1
)

require (
Expand Down
4 changes: 2 additions & 2 deletions cmd/githubgen/go.sum

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

12 changes: 6 additions & 6 deletions cmd/mdatagen/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ go 1.20
require (
github.com/google/go-cmp v0.6.0
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/collector/component v0.90.0
go.opentelemetry.io/collector/confmap v0.90.0
go.opentelemetry.io/collector/component v0.90.1
go.opentelemetry.io/collector/confmap v0.90.1
go.opentelemetry.io/collector/pdata v1.0.0
go.opentelemetry.io/collector/receiver v0.90.0
go.opentelemetry.io/collector/semconv v0.90.0
go.opentelemetry.io/collector/receiver v0.90.1
go.opentelemetry.io/collector/semconv v0.90.1
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.26.0
golang.org/x/text v0.14.0
Expand All @@ -30,8 +30,8 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.90.0 // indirect
go.opentelemetry.io/collector/consumer v0.90.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.90.1 // indirect
go.opentelemetry.io/collector/consumer v0.90.1 // indirect
go.opentelemetry.io/collector/featuregate v1.0.0 // indirect
go.opentelemetry.io/otel v1.21.0 // indirect
go.opentelemetry.io/otel/metric v1.21.0 // indirect
Expand Down
Loading

0 comments on commit 7fc2229

Please sign in to comment.