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
make genoteltestbedcol
  • Loading branch information
@TylerHelmuth
TylerHelmuth committed Jun 28, 2024
commit f75d98917e094c1edb9862c46c12aa8378954474
16 changes: 8 additions & 8 deletions cmd/oteltestbedcol/builder-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ dist:
otelcol_version: 0.103.0

extensions:
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.103.0
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.103.0
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.103.1-0.20240628190926-ee4eb85f58e9
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.103.1-0.20240628190926-ee4eb85f58e9
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.103.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.103.0

exporters:
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.103.0
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.103.0
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.103.0
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.103.1-0.20240628190926-ee4eb85f58e9
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.103.1-0.20240628190926-ee4eb85f58e9
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.103.1-0.20240628190926-ee4eb85f58e9
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.103.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.103.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter v0.103.0
Expand All @@ -31,13 +31,13 @@ exporters:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.103.0

processors:
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.103.0
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.103.0
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.103.1-0.20240628190926-ee4eb85f58e9
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.103.1-0.20240628190926-ee4eb85f58e9
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.103.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.103.0

receivers:
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.103.0
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.103.1-0.20240628190926-ee4eb85f58e9
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.103.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.103.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.103.0
Expand Down
10 changes: 5 additions & 5 deletions cmd/oteltestbedcol/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.103.0
go.opentelemetry.io/collector/component v0.103.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/confmap v0.103.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.103.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/confmap/provider/envprovider v0.103.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.103.0
go.opentelemetry.io/collector/confmap/provider/envprovider v0.103.0
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.103.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/confmap/provider/httpprovider v0.103.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.103.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.103.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/confmap/provider/httpprovider v0.103.0
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.103.0
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.103.0
go.opentelemetry.io/collector/connector v0.103.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/exporter v0.103.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/exporter/debugexporter v0.103.1-0.20240628190926-ee4eb85f58e9
Expand Down
20 changes: 10 additions & 10 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.

Loading