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 9 commits
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions cmd/githubgen/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ go 1.21.0

require (
github.com/google/go-github/v62 v62.0.0
go.opentelemetry.io/collector/confmap v0.103.0
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.103.0
go.opentelemetry.io/collector/confmap v0.103.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.103.1-0.20240628190926-ee4eb85f58e9
gopkg.in/yaml.v3 v3.0.1
)

Expand All @@ -18,7 +18,7 @@ require (
github.com/knadh/koanf/v2 v2.1.1 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
go.opentelemetry.io/collector/featuregate v1.10.0 // indirect
go.opentelemetry.io/collector/featuregate v1.10.1-0.20240628190926-ee4eb85f58e9 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
)
12 changes: 6 additions & 6 deletions cmd/githubgen/go.sum
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions cmd/opampsupervisor/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ require (
github.com/knadh/koanf/v2 v2.1.1
github.com/open-telemetry/opamp-go v0.15.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/config/configopaque v1.10.0
go.opentelemetry.io/collector/config/configtls v0.103.0
go.opentelemetry.io/collector/semconv v0.103.0
go.opentelemetry.io/collector/config/configopaque v1.10.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/config/configtls v0.103.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/semconv v0.103.1-0.20240628190926-ee4eb85f58e9
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
google.golang.org/protobuf v1.34.2
Expand Down
12 changes: 6 additions & 6 deletions cmd/opampsupervisor/go.sum
View file
Open in desktop

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

32 changes: 16 additions & 16 deletions cmd/otelcontribcol/builder-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ dist:
otelcol_version: 0.103.0

extensions:
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.103.0
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.103.0
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.103.1-0.20240628190926-ee4eb85f58e9
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.103.1-0.20240628190926-ee4eb85f58e9
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.103.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.103.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.103.0
Expand Down Expand Up @@ -52,10 +52,10 @@ extensions:
import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/zipkinencodingextension

exporters:
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.103.0
- gomod: go.opentelemetry.io/collector/exporter/nopexporter 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/nopexporter 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/alertmanagerexporter v0.103.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.103.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.103.0
Expand Down Expand Up @@ -102,8 +102,8 @@ 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/cumulativetodeltaprocessor v0.103.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.103.0
Expand All @@ -126,8 +126,8 @@ processors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.103.0

receivers:
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.103.0
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.103.0
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.103.1-0.20240628190926-ee4eb85f58e9
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.103.1-0.20240628190926-ee4eb85f58e9
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.103.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.103.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.103.0
Expand Down Expand Up @@ -218,7 +218,7 @@ receivers:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.103.0

connectors:
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.103.0
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.103.1-0.20240628190926-ee4eb85f58e9
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.103.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.103.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.103.0
Expand All @@ -230,11 +230,11 @@ connectors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.103.0

providers:
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.103.0
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.103.0
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.103.0
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.103.0
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.103.0
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.103.1-0.20240628190926-ee4eb85f58e9
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.103.1-0.20240628190926-ee4eb85f58e9
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.103.1-0.20240628190926-ee4eb85f58e9
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.103.1-0.20240628190926-ee4eb85f58e9
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.103.1-0.20240628190926-ee4eb85f58e9
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.103.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.103.0

Expand Down
88 changes: 44 additions & 44 deletions cmd/otelcontribcol/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,36 +205,36 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.103.0
github.com/prometheus/prometheus v0.51.2-0.20240405174432-b4a973753c6e
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.103.0
go.opentelemetry.io/collector/config/configgrpc v0.103.0
go.opentelemetry.io/collector/config/confighttp v0.103.0
go.opentelemetry.io/collector/config/configopaque v1.10.0
go.opentelemetry.io/collector/confmap v0.103.0
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.0
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.0
go.opentelemetry.io/collector/connector/forwardconnector v0.103.0
go.opentelemetry.io/collector/consumer v0.103.0
go.opentelemetry.io/collector/exporter v0.103.0
go.opentelemetry.io/collector/exporter/debugexporter v0.103.0
go.opentelemetry.io/collector/exporter/nopexporter v0.103.0
go.opentelemetry.io/collector/exporter/otlpexporter v0.103.0
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.103.0
go.opentelemetry.io/collector/extension v0.103.0
go.opentelemetry.io/collector/extension/ballastextension v0.103.0
go.opentelemetry.io/collector/extension/zpagesextension v0.103.0
go.opentelemetry.io/collector/otelcol v0.103.0
go.opentelemetry.io/collector/pdata v1.10.0
go.opentelemetry.io/collector/processor v0.103.0
go.opentelemetry.io/collector/processor/batchprocessor v0.103.0
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.103.0
go.opentelemetry.io/collector/receiver v0.103.0
go.opentelemetry.io/collector/receiver/nopreceiver v0.103.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.103.0
go.opentelemetry.io/collector/component v0.103.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/config/configgrpc v0.103.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/config/confighttp v0.103.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/config/configopaque v1.10.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/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/connector v0.103.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/connector/forwardconnector v0.103.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/consumer 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
go.opentelemetry.io/collector/exporter/nopexporter v0.103.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/exporter/otlpexporter v0.103.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.103.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/extension v0.103.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/extension/ballastextension v0.103.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/extension/zpagesextension v0.103.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/otelcol v0.103.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/pdata v1.10.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/processor v0.103.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/processor/batchprocessor v0.103.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.103.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/receiver v0.103.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/receiver/nopreceiver v0.103.1-0.20240628190926-ee4eb85f58e9
go.opentelemetry.io/collector/receiver/otlpreceiver v0.103.1-0.20240628190926-ee4eb85f58e9
golang.org/x/sys v0.21.0
)

Expand Down Expand Up @@ -712,7 +712,7 @@ require (
github.com/spaolacci/murmur3 v1.1.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/cobra v1.8.0 // indirect
github.com/spf13/cobra v1.8.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.19.0 // indirect
Expand Down Expand Up @@ -754,19 +754,19 @@ require (
go.mongodb.org/atlas v0.36.0 // indirect
go.mongodb.org/mongo-driver v1.15.1 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector v0.103.0 // indirect
go.opentelemetry.io/collector/config/configauth v0.103.0 // indirect
go.opentelemetry.io/collector/config/configcompression v1.10.0 // indirect
go.opentelemetry.io/collector/config/confignet v0.103.0 // indirect
go.opentelemetry.io/collector/config/configretry v0.103.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect
go.opentelemetry.io/collector/config/configtls v0.103.0 // indirect
go.opentelemetry.io/collector/config/internal v0.103.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.103.0 // indirect
go.opentelemetry.io/collector/featuregate v1.10.0 // indirect
go.opentelemetry.io/collector/filter v0.103.0 // indirect
go.opentelemetry.io/collector/semconv v0.103.0 // indirect
go.opentelemetry.io/collector/service v0.103.0 // indirect
go.opentelemetry.io/collector v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/config/configauth v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/config/configcompression v1.10.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/config/confignet v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/config/configretry v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/config/configtls v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
go.opentelemetry.io/collector/config/internal v0.103.1-0.20240628190926-ee4eb85f58e9 // indirect
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/filter 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
go.opentelemetry.io/contrib/config v0.7.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect
Expand Down
Loading