Skip to content

[chore] Update Core #33593

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

Merged
merged 9 commits into from
Jun 17, 2024
Merged

[chore] Update Core #33593

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
b309972
[chore] multimod update stable modules
djaglowski Jun 17, 2024
65407eb
[chore] multimod update beta modules
djaglowski Jun 17, 2024
a768325
Update core
djaglowski Jun 17, 2024
5611fcc
[chore] multimod update stable modules
djaglowski Jun 17, 2024
c37dc1b
[chore] multimod update beta modules
djaglowski Jun 17, 2024
2e85cf8
Run make update-otel a second time
djaglowski Jun 17, 2024
7e5a207
[chore] multimod update beta modules
djaglowski Jun 17, 2024
ea3407f
Run make update-otel a 3rd time
djaglowski Jun 17, 2024
57ef5c2
Manually update core module versions in builder configs
djaglowski Jun 17, 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: 4 additions & 2 deletions cmd/githubgen/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,21 @@ go 1.21.0

require (
github.com/google/go-github/v62 v62.0.0
go.opentelemetry.io/collector/confmap v0.102.2-0.20240611143128-7dfb57b9ad1c
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.2-0.20240611143128-7dfb57b9ad1c
go.opentelemetry.io/collector/confmap v0.102.2-0.20240617165252-f88ce7a687ba
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.2-0.20240617165252-f88ce7a687ba
gopkg.in/yaml.v3 v3.0.1
)

require (
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/knadh/koanf/maps v0.1.1 // indirect
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
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.9.1-0.20240617165252-f88ce7a687ba // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
)
21 changes: 16 additions & 5 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.9.1-0.20240611143128-7dfb57b9ad1c
go.opentelemetry.io/collector/config/configtls v0.102.2-0.20240611143128-7dfb57b9ad1c
go.opentelemetry.io/collector/semconv v0.102.2-0.20240611143128-7dfb57b9ad1c
go.opentelemetry.io/collector/config/configopaque v1.9.1-0.20240617165252-f88ce7a687ba
go.opentelemetry.io/collector/config/configtls v0.102.2-0.20240617165252-f88ce7a687ba
go.opentelemetry.io/collector/semconv v0.102.2-0.20240617165252-f88ce7a687ba
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.

36 changes: 18 additions & 18 deletions cmd/otelcontribcol/builder-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# NOTE:
# This builder configuration is NOT used to build any official binary.
# To see the builder manifests used for official binaries,
# To see the builder manifests used for official binaries,
# check https://github.com/open-telemetry/opentelemetry-collector-releases
#
#
# For the OpenTelemetry Collector Contrib official distribution sources, check
# https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib

Expand All @@ -14,8 +14,8 @@ dist:
otelcol_version: 0.102.1

extensions:
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.102.2-0.20240611143128-7dfb57b9ad1c
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.102.2-0.20240611143128-7dfb57b9ad1c
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.102.2-0.20240617165252-f88ce7a687ba
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.102.2-0.20240617165252-f88ce7a687ba
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.102.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.102.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.102.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.102.2-0.20240611143128-7dfb57b9ad1c
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.102.2-0.20240611143128-7dfb57b9ad1c
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.102.2-0.20240611143128-7dfb57b9ad1c
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.102.2-0.20240611143128-7dfb57b9ad1c
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.102.2-0.20240617165252-f88ce7a687ba
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.102.2-0.20240617165252-f88ce7a687ba
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.102.2-0.20240617165252-f88ce7a687ba
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.102.2-0.20240617165252-f88ce7a687ba
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter v0.102.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.102.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.102.0
Expand Down Expand Up @@ -101,8 +101,8 @@ exporters:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.102.0

processors:
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.102.2-0.20240611143128-7dfb57b9ad1c
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.102.2-0.20240611143128-7dfb57b9ad1c
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.102.2-0.20240617165252-f88ce7a687ba
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.102.2-0.20240617165252-f88ce7a687ba
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.102.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.102.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.102.0
Expand All @@ -125,8 +125,8 @@ processors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.102.0

receivers:
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.102.2-0.20240611143128-7dfb57b9ad1c
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.2-0.20240611143128-7dfb57b9ad1c
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.102.2-0.20240617165252-f88ce7a687ba
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.2-0.20240617165252-f88ce7a687ba
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.102.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.102.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.102.0
Expand Down Expand Up @@ -216,7 +216,7 @@ receivers:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.102.0

connectors:
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.102.2-0.20240611143128-7dfb57b9ad1c
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.102.2-0.20240617165252-f88ce7a687ba
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.102.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.102.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.102.0
Expand All @@ -228,11 +228,11 @@ connectors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.102.0

providers:
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.102.2-0.20240611143128-7dfb57b9ad1c
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.2-0.20240611143128-7dfb57b9ad1c
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.102.2-0.20240611143128-7dfb57b9ad1c
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.102.2-0.20240611143128-7dfb57b9ad1c
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.102.2-0.20240611143128-7dfb57b9ad1c
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.102.2-0.20240617165252-f88ce7a687ba
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.2-0.20240617165252-f88ce7a687ba
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.102.2-0.20240617165252-f88ce7a687ba
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.102.2-0.20240617165252-f88ce7a687ba
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.102.2-0.20240617165252-f88ce7a687ba
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.102.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.102.0

Expand Down
Loading