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

[chore] Update otel #33813

Merged
merged 13 commits into from
Jul 1, 2024
Merged

[chore] Update otel #33813

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
99283e1
[chore] multimod update stable modules
TylerHelmuth Jun 28, 2024
bf400b8
[chore] multimod update beta modules
TylerHelmuth Jun 28, 2024
ac74219
make gotidy
TylerHelmuth Jun 28, 2024
9e71bac
Update otelcontribcol
TylerHelmuth Jun 28, 2024
4a8f2a2
Update pprofile version
TylerHelmuth Jun 28, 2024
f75d989
make genoteltestbedcol
TylerHelmuth Jun 28, 2024
f0efd97
fix all pprofile imports
TylerHelmuth Jun 28, 2024
d795ac2
make genotelcontribcol
TylerHelmuth Jun 28, 2024
724862b
Merge branch 'main' into update-otel
TylerHelmuth Jun 30, 2024
4994613
merge in upstream/main
TylerHelmuth Jul 1, 2024
75510ed
[chore] multimod update stable modules
TylerHelmuth Jul 1, 2024
0ed9598
[chore] multimod update beta modules
TylerHelmuth Jul 1, 2024
8ea2144
make gotidy
TylerHelmuth Jul 1, 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
fix all pprofile imports
  • Loading branch information
@TylerHelmuth
TylerHelmuth committed Jun 28, 2024
commit f0efd977c13769d9f06276e004895a1c620a699f
4 changes: 2 additions & 2 deletions cmd/oteltestbedcol/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion connector/datadogconnector/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ require (
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/extension v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/extension/auth v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/pdata/testdata v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/service v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/contrib/config v0.7.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions connector/datadogconnector/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion connector/servicegraphconnector/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ require (
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/extension v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/otelcol v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/pdata/testdata v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/receiver v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/service v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
Expand Down
4 changes: 2 additions & 2 deletions connector/servicegraphconnector/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion exporter/alibabacloudlogserviceexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ require (
go.opentelemetry.io/collector/consumer v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/extension v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/featuregate v1.10.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/receiver v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/otel v1.27.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/alibabacloudlogserviceexporter/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion exporter/awss3exporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ require (
go.opentelemetry.io/collector/extension v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/featuregate v1.10.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/otelcol v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/pdata/testdata v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/processor v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/receiver v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/awss3exporter/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion exporter/datadogexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ require (
go.opentelemetry.io/collector/extension v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/extension/auth v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/filter v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/pdata/testdata v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/service v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/contrib/config v0.7.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/datadogexporter/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion exporter/datadogexporter/integrationtest/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ require (
go.opentelemetry.io/collector/extension v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/extension/auth v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/pdata v1.10.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/pdata/testdata v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/semconv v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/service v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/datadogexporter/integrationtest/go.sum
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions exporter/elasticsearchexporter/integrationtest/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion exporter/googlemanagedprometheusexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ require (
go.opentelemetry.io/collector/extension v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/featuregate v1.10.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/otelcol v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/pdata/testdata v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/processor v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/receiver v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/googlemanagedprometheusexporter/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion exporter/kafkaexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ require (
go.opentelemetry.io/collector/config/configtelemetry v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/extension v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/featuregate v1.10.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/receiver v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/otel v1.27.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/kafkaexporter/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion exporter/loadbalancingexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ require (
go.opentelemetry.io/collector/extension/auth v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/featuregate v1.10.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/otelcol v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.103.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/pdata/testdata v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/processor v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/receiver v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
Expand Down
Loading
Loading