Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[component] Remove ReportStatus from component.TelemetrySettings #10777

Merged
merged 18 commits into from
Aug 16, 2024
Merged

[component] Remove ReportStatus from component.TelemetrySettings #10777

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
6765387
Remove ReportStatus from component.TelemetrySettings
TylerHelmuth Jul 31, 2024
b91cddb
Update changelog
TylerHelmuth Aug 1, 2024
8d7bc38
Fix lint
TylerHelmuth Aug 1, 2024
172235a
Merge in upstream/main
TylerHelmuth Aug 1, 2024
e2661e0
Fix merge
TylerHelmuth Aug 1, 2024
179c1aa
Fix lint
TylerHelmuth Aug 1, 2024
7d20b50
Fix lint
TylerHelmuth Aug 1, 2024
e1e106e
Try adding locks
TylerHelmuth Aug 2, 2024
3d5dc69
merge in upstream/main
TylerHelmuth Aug 2, 2024
3897d75
simplify locks
TylerHelmuth Aug 2, 2024
ffb41f2
Disable metrics server in test
TylerHelmuth Aug 2, 2024
bf9ec94
Merge in upstream/main
TylerHelmuth Aug 6, 2024
cd93672
merge in upstream/main
TylerHelmuth Aug 7, 2024
1e6a304
merge in upstream/main
TylerHelmuth Aug 13, 2024
437fc09
merge in upstream/main
TylerHelmuth Aug 14, 2024
6704c5d
make crosslink
TylerHelmuth Aug 14, 2024
8e61d2f
add another changelog
TylerHelmuth Aug 14, 2024
24ede16
Merge branch 'main' into component-remove-reporting-from-struct-2
mx-psi Aug 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
merge in upstream/main
  • Loading branch information
@TylerHelmuth
TylerHelmuth committed Aug 7, 2024
commit cd93672e50ac79dc50f0cc26439aa7b03fee7333
4 changes: 2 additions & 2 deletions internal/e2e/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@ require (
go.opentelemetry.io/otel/trace v1.28.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.27.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/text v0.17.0 // indirect
gonum.org/v1/gonum v0.15.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.