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

[chore] update core modules #33977

Merged
merged 9 commits into from
Jul 9, 2024
Merged

[chore] update core modules #33977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7e23ed5
[chore] multimod update stable modules
mx-psi Jul 9, 2024
666055f
[chore] multimod update beta modules
mx-psi Jul 9, 2024
d48f083
[chore] Explicitly require internal/featuregates and tidy
mx-psi Jul 9, 2024
dfd1c8b
make genotelcontribcol && make genoteltestbedcol
mx-psi Jul 9, 2024
5e029b0
Merge remote-tracking branch 'origin/main' into mx-psi/update-otel-co…
mx-psi Jul 9, 2024
8bbf8e0
Fix bad merge
mx-psi Jul 9, 2024
4b3e068
Merge remote-tracking branch 'origin/main' into mx-psi/update-otel-co…
mx-psi Jul 9, 2024
89d87fa
make generate
mx-psi Jul 9, 2024
d7bc7ed
Merge branch 'main' into mx-psi/update-otel-configtls
mx-psi Jul 9, 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
  •  
  •  
  •  
7 changes: 4 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.104.1-0.20240705135726-e014c1ed756c
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.1-0.20240705135726-e014c1ed756c
go.opentelemetry.io/collector/confmap v0.104.1-0.20240709093154-e7ce1d50fb5e
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.1-0.20240709093154-e7ce1d50fb5e
gopkg.in/yaml.v3 v3.0.1
)

Expand All @@ -18,7 +18,8 @@ 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.11.1-0.20240705135726-e014c1ed756c // indirect
go.opentelemetry.io/collector/featuregate v1.11.1-0.20240709093154-e7ce1d50fb5e // indirect
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
)
14 changes: 8 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.11.1-0.20240705135726-e014c1ed756c
go.opentelemetry.io/collector/config/configtls v0.104.1-0.20240705135726-e014c1ed756c
go.opentelemetry.io/collector/semconv v0.104.1-0.20240705135726-e014c1ed756c
go.opentelemetry.io/collector/config/configopaque v1.11.1-0.20240709093154-e7ce1d50fb5e
go.opentelemetry.io/collector/config/configtls v0.104.1-0.20240709093154-e7ce1d50fb5e
go.opentelemetry.io/collector/semconv v0.104.1-0.20240709093154-e7ce1d50fb5e
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.

38 changes: 19 additions & 19 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.104.0

extensions:
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.104.1-0.20240705135726-e014c1ed756c
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.104.1-0.20240705135726-e014c1ed756c
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.104.1-0.20240709093154-e7ce1d50fb5e
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.104.1-0.20240709093154-e7ce1d50fb5e
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.104.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.104.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.104.0
Expand Down Expand Up @@ -53,10 +53,10 @@ extensions:
import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/zipkinencodingextension

exporters:
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.104.1-0.20240705135726-e014c1ed756c
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.104.1-0.20240705135726-e014c1ed756c
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.104.1-0.20240705135726-e014c1ed756c
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.104.1-0.20240705135726-e014c1ed756c
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.104.1-0.20240709093154-e7ce1d50fb5e
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.104.1-0.20240709093154-e7ce1d50fb5e
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.104.1-0.20240709093154-e7ce1d50fb5e
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.104.1-0.20240709093154-e7ce1d50fb5e
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter v0.104.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.104.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.104.0
Expand Down Expand Up @@ -103,8 +103,8 @@ exporters:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.104.0

processors:
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.104.1-0.20240705135726-e014c1ed756c
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.104.1-0.20240705135726-e014c1ed756c
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.104.1-0.20240709093154-e7ce1d50fb5e
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.104.1-0.20240709093154-e7ce1d50fb5e
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.104.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.104.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.104.0
Expand All @@ -127,8 +127,8 @@ processors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.104.0

receivers:
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.104.1-0.20240705135726-e014c1ed756c
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.104.1-0.20240705135726-e014c1ed756c
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.104.1-0.20240709093154-e7ce1d50fb5e
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.104.1-0.20240709093154-e7ce1d50fb5e
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.104.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.104.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.104.0
Expand Down Expand Up @@ -219,7 +219,7 @@ receivers:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.104.0

connectors:
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.104.1-0.20240705135726-e014c1ed756c
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.104.1-0.20240709093154-e7ce1d50fb5e
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.104.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.104.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.104.0
Expand All @@ -231,13 +231,13 @@ connectors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.104.0

providers:
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.104.1-0.20240705135726-e014c1ed756c
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.1-0.20240705135726-e014c1ed756c
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.104.1-0.20240705135726-e014c1ed756c
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.104.1-0.20240705135726-e014c1ed756c
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.104.1-0.20240705135726-e014c1ed756c
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.104.1-0.20240705135726-e014c1ed756c
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.104.1-0.20240705135726-e014c1ed756c
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.104.1-0.20240709093154-e7ce1d50fb5e
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.1-0.20240709093154-e7ce1d50fb5e
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.104.1-0.20240709093154-e7ce1d50fb5e
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.104.1-0.20240709093154-e7ce1d50fb5e
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.104.1-0.20240709093154-e7ce1d50fb5e
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.104.1-0.20240709093154-e7ce1d50fb5e
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.104.1-0.20240709093154-e7ce1d50fb5e

replaces:
- github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage => ../../extension/storage
Expand Down Expand Up @@ -485,4 +485,4 @@ replaces:
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil => ../../internal/pdatautil
- github.com/open-telemetry/opentelemetry-collector-contrib/exporter/otelarrowexporter => ../../exporter/otelarrowexporter
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otelarrowreceiver => ../../receiver/otelarrowreceiver
- github.com/open-telemetry/opentelemetry-collector-contrib/exporter/rabbitmqexporter => ../../exporter/rabbitmqexporter
- github.com/open-telemetry/opentelemetry-collector-contrib/exporter/rabbitmqexporter => ../../exporter/rabbitmqexporter
Loading