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

Update core latest #37601

Merged
merged 10 commits into from
Jan 31, 2025
+16,628 −16,510
Merged

Update core latest #37601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a4592b6
[chore] multimod update stable modules
bogdandrutu Jan 30, 2025
975c20b
[chore] multimod update beta modules
bogdandrutu Jan 30, 2025
7006716
[chore] run make gotidy
bogdandrutu Jan 30, 2025
9e93662
Fix make update-otel
bogdandrutu Jan 30, 2025
331745b
[chore] multimod update stable modules
bogdandrutu Jan 30, 2025
1dc4def
[chore] multimod update beta modules
bogdandrutu Jan 30, 2025
7b28a4a
[chore] mod and toolchain tidy
bogdandrutu Jan 30, 2025
9c5325a
[chore] multimod update stable modules
bogdandrutu Jan 31, 2025
a11742a
[chore] multimod update beta modules
bogdandrutu Jan 31, 2025
30ef448
[chore] mod and toolchain tidy
bogdandrutu Jan 31, 2025
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
  •  
  •  
  •  
9 changes: 6 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ OTEL_STABLE_VERSION=main
VERSION=$(shell git describe --always --match "v[0-9]*" HEAD)
TRIMMED_VERSION=$(shell grep -o 'v[^-]*' <<< "$(VERSION)" | cut -c 2-)
CORE_VERSIONS=$(SRC_PARENT_DIR)/opentelemetry-collector/versions.yaml
GOMOD=$(SRC_ROOT)/cmd/otelcontribcol/go.mod

COMP_REL_PATH=cmd/otelcontribcol/components.go
MOD_NAME=github.com/open-telemetry/opentelemetry-collector-contrib
Expand Down Expand Up @@ -415,9 +414,13 @@ update-otel:$(MULTIMOD)
$(MULTIMOD) sync -s=true -o ../opentelemetry-collector -m beta --commit-hash $(OTEL_VERSION)
git add . && git commit -s -m "[chore] multimod update beta modules" ; \
$(MAKE) gotidy
$(call updatehelper,$(CORE_VERSIONS),$(GOMOD),./cmd/otelcontribcol/builder-config.yaml)
$(call updatehelper,$(CORE_VERSIONS),$(GOMOD),./cmd/oteltestbedcol/builder-config.yaml)
# Ensure the otelcontribcol is generated, update deps, then
$(MAKE) genotelcontribcol
$(call updatehelper,$(CORE_VERSIONS),./cmd/otelcontribcol/go.mod,./cmd/otelcontribcol/builder-config.yaml)
$(MAKE) genotelcontribcol
# Ensure the otelcontribcol is generated.
$(MAKE) genoteltestbedcol
$(call updatehelper,$(CORE_VERSIONS),./cmd/oteltestbedcol/go.mod,./cmd/oteltestbedcol/builder-config.yaml)
$(MAKE) genoteltestbedcol
$(MAKE) generate
$(MAKE) crosslink
Expand Down
4 changes: 2 additions & 2 deletions cmd/githubgen/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ go 1.22.0

require (
github.com/google/go-github/v68 v68.0.0
go.opentelemetry.io/collector/confmap v1.24.1-0.20250130000211-c119b2a55eb4
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.24.1-0.20250130000211-c119b2a55eb4
go.opentelemetry.io/collector/confmap v1.24.1-0.20250130224751-50b76b95bf35
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.24.1-0.20250130224751-50b76b95bf35
gopkg.in/yaml.v3 v3.0.1
)

Expand Down
8 changes: 4 additions & 4 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.

12 changes: 6 additions & 6 deletions cmd/opampsupervisor/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ require (
github.com/knadh/koanf/v2 v2.1.2
github.com/open-telemetry/opamp-go v0.18.0
github.com/stretchr/testify v1.10.0
go.opentelemetry.io/collector/config/configopaque v1.24.1-0.20250130000211-c119b2a55eb4
go.opentelemetry.io/collector/config/configtls v1.24.1-0.20250130000211-c119b2a55eb4
go.opentelemetry.io/collector/confmap v1.24.1-0.20250130000211-c119b2a55eb4
go.opentelemetry.io/collector/confmap/provider/envprovider v1.24.1-0.20250130000211-c119b2a55eb4
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.24.1-0.20250130000211-c119b2a55eb4
go.opentelemetry.io/collector/semconv v0.118.1-0.20250130000211-c119b2a55eb4
go.opentelemetry.io/collector/config/configopaque v1.24.1-0.20250130224751-50b76b95bf35
go.opentelemetry.io/collector/config/configtls v1.24.1-0.20250130224751-50b76b95bf35
go.opentelemetry.io/collector/confmap v1.24.1-0.20250130224751-50b76b95bf35
go.opentelemetry.io/collector/confmap/provider/envprovider v1.24.1-0.20250130224751-50b76b95bf35
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.24.1-0.20250130224751-50b76b95bf35
go.opentelemetry.io/collector/semconv v0.118.1-0.20250130224751-50b76b95bf35
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
golang.org/x/sys v0.29.0
Expand Down
24 changes: 12 additions & 12 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.

18 changes: 9 additions & 9 deletions cmd/otelcontribcol/builder-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ extensions:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/skywalkingencodingextension v0.118.0

exporters:
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.118.1-0.20250123125445-24f88da7b583
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.118.1-0.20250130224751-50b76b95bf35
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.118.1-0.20250123125445-24f88da7b583
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.118.1-0.20250123125445-24f88da7b583
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.118.1-0.20250130224751-50b76b95bf35
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.118.1-0.20250123125445-24f88da7b583
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter v0.118.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.118.0
Expand Down Expand Up @@ -102,8 +102,8 @@ exporters:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.118.0

processors:
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.118.1-0.20250123125445-24f88da7b583
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.118.1-0.20250123125445-24f88da7b583
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.118.1-0.20250130224751-50b76b95bf35
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.118.1-0.20250130224751-50b76b95bf35
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.118.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.118.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.118.0
Expand All @@ -130,7 +130,7 @@ processors:

receivers:
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.118.1-0.20250123125445-24f88da7b583
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.118.1-0.20250123125445-24f88da7b583
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.118.1-0.20250130224751-50b76b95bf35
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.118.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.118.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.118.0
Expand Down Expand Up @@ -242,11 +242,11 @@ connectors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/signaltometricsconnector v0.118.0

providers:
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.24.1-0.20250123125445-24f88da7b583
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.24.1-0.20250123125445-24f88da7b583
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.24.1-0.20250123125445-24f88da7b583
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.24.1-0.20250130224751-50b76b95bf35
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.24.1-0.20250130224751-50b76b95bf35
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.24.1-0.20250130224751-50b76b95bf35
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.24.1-0.20250123125445-24f88da7b583
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.24.1-0.20250123125445-24f88da7b583
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.24.1-0.20250130224751-50b76b95bf35
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.118.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.118.0

Expand Down
4 changes: 2 additions & 2 deletions cmd/oteltestbedcol/builder-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ exporters:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.118.0

processors:
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.118.1-0.20250123125445-24f88da7b583
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.118.1-0.20250130224751-50b76b95bf35
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.118.1-0.20250123125445-24f88da7b583
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.118.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.118.0
Expand All @@ -55,7 +55,7 @@ receivers:

providers:
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.24.1-0.20250123125445-24f88da7b583
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.24.1-0.20250123125445-24f88da7b583
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.24.1-0.20250130224751-50b76b95bf35
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.24.1-0.20250123125445-24f88da7b583
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.24.1-0.20250123125445-24f88da7b583
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.24.1-0.20250123125445-24f88da7b583
Expand Down
8 changes: 4 additions & 4 deletions cmd/telemetrygen/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ require (
github.com/spf13/cobra v1.8.1
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.10.0
go.opentelemetry.io/collector/component v0.118.1-0.20250130000211-c119b2a55eb4
go.opentelemetry.io/collector/pdata v1.24.1-0.20250130000211-c119b2a55eb4
go.opentelemetry.io/collector/semconv v0.118.1-0.20250130000211-c119b2a55eb4
go.opentelemetry.io/collector/component v0.118.1-0.20250130224751-50b76b95bf35
go.opentelemetry.io/collector/pdata v1.24.1-0.20250130224751-50b76b95bf35
go.opentelemetry.io/collector/semconv v0.118.1-0.20250130224751-50b76b95bf35
go.opentelemetry.io/otel v1.34.0
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.8.0
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.8.0
Expand Down Expand Up @@ -43,7 +43,7 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.118.1-0.20250130000211-c119b2a55eb4 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.118.1-0.20250130224751-50b76b95bf35 // indirect
go.opentelemetry.io/otel/metric v1.34.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.33.0 // indirect
Expand Down
16 changes: 8 additions & 8 deletions cmd/telemetrygen/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
Loading