Skip to content

Commit 15a1ff9

Browse files
codebotencodeboten
authored
Merge branch 'main' into renovate/github.colasdn.workers.dev-linkedin-goavro-v2-2.x
2 parents 25113c9 + 930f85f commit 15a1ff9

File tree

17 files changed

+98
-569
lines changed

17 files changed

+98
-569
lines changed

‎.github/workflows/build-and-test.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -351,9 +351,7 @@ jobs:
351351
- exporter-1
352352
- exporter-2
353353
- exporter-3
354-
- extension-0
355-
- extension-1
356-
- extension-2
354+
- extension
357355
- connector
358356
- internal
359357
- pkg
@@ -382,7 +380,7 @@ jobs:
382380

383381
integration-tests:
384382
if: ${{ github.actor != 'dependabot[bot]' && always() }}
385-
runs-on: ubuntu-latest
383+
runs-on: ubuntu-24.04
386384
needs: [setup-environment, integration-tests-matrix]
387385
steps:
388386
- name: Print result

‎Makefile

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,7 @@ EXPORTER_MODS_1 := $(shell find ./exporter/[d-i]* $(FIND_MOD_ARGS) -exec $(TO_MO
4242
EXPORTER_MODS_2 := $(shell find ./exporter/[k-o]* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
4343
EXPORTER_MODS_3 := $(shell find ./exporter/[p-z]* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
4444
EXPORTER_MODS := $(EXPORTER_MODS_0) $(EXPORTER_MODS_1) $(EXPORTER_MODS_2) $(EXPORTER_MODS_3)
45-
EXTENSION_MODS_0 := $(shell find ./extension/[a-d]* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
46-
EXTENSION_MODS_1 := $(shell find ./extension/[e]* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
47-
EXTENSION_MODS_2 := $(shell find ./extension/[f-z]* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
48-
EXTENSION_MODS := $(EXTENSION_MODS_0) $(EXTENSION_MODS_1) $(EXTENSION_MODS_2)
45+
EXTENSION_MODS := $(shell find ./extension/* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
4946
CONNECTOR_MODS := $(shell find ./connector/* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
5047
INTERNAL_MODS := $(shell find ./internal/* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
5148
PKG_MODS := $(shell find ./pkg/* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
@@ -81,9 +78,7 @@ all-groups:
8178
@echo "\nexporter-1: $(EXPORTER_MODS_1)"
8279
@echo "\nexporter-2: $(EXPORTER_MODS_2)"
8380
@echo "\nexporter-3: $(EXPORTER_MODS_3)"
84-
@echo "\nextension-0: $(EXTENSION_MODS_0)"
85-
@echo "\nextension-1: $(EXTENSION_MODS_1)"
86-
@echo "\nextension-2: $(EXTENSION_MODS_2)"
81+
@echo "\nextension: $(EXTENSION_MODS)"
8782
@echo "\nconnector: $(CONNECTOR_MODS)"
8883
@echo "\ninternal: $(INTERNAL_MODS)"
8984
@echo "\npkg: $(PKG_MODS)"
@@ -250,15 +245,6 @@ for-exporter-3-target: $(EXPORTER_MODS_3)
250245
.PHONY: for-extension-target
251246
for-extension-target: $(EXTENSION_MODS)
252247

253-
.PHONY: for-extension-0-target
254-
for-extension-0-target: $(EXTENSION_MODS_0)
255-
256-
.PHONY: for-extension-1-target
257-
for-extension-1-target: $(EXTENSION_MODS_1)
258-
259-
.PHONY: for-extension-2-target
260-
for-extension-2-target: $(EXTENSION_MODS_2)
261-
262248
.PHONY: for-connector-target
263249
for-connector-target: $(CONNECTOR_MODS)
264250

‎Makefile.Common

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,9 @@ GO_BUILD_TAGS=""
2929
GO_BUILD_LDFLAGS="-s -w"
3030
GOTEST_TIMEOUT?= 600s
3131
GOTEST_OPT?= -race -timeout $(GOTEST_TIMEOUT) -parallel 4 --tags=$(GO_BUILD_TAGS)
32-
GOTEST_INTEGRATION_OPT?= -race -timeout 360s -parallel 4 -skip Sudo
33-
GOTEST_INTEGRATION_OPT_SUDO?= -race -timeout 360s -parallel 4 -exec sudo -run Sudo
32+
GOTEST_INTEGRATION_OPT?= -race -timeout 360s -parallel 4
3433
GOTEST_OPT_WITH_COVERAGE = $(GOTEST_OPT) -coverprofile=coverage.txt -covermode=atomic
3534
GOTEST_OPT_WITH_INTEGRATION=$(GOTEST_INTEGRATION_OPT) -tags=integration,$(GO_BUILD_TAGS)
36-
GOTEST_OPT_WITH_INTEGRATION_SUDO=$(GOTEST_INTEGRATION_OPT_SUDO) -tags=integration,$(GO_BUILD_TAGS)
3735
GOTEST_OPT_WITH_INTEGRATION_COVERAGE=$(GOTEST_OPT_WITH_INTEGRATION) -coverprofile=integration-coverage.txt -covermode=atomic
3836
GOCMD?= go
3937
GOOS=$(shell $(GOCMD) env GOOS)
@@ -156,13 +154,12 @@ endif
156154
runbuilttest: $(GOTESTSUM)
157155
ifneq (,$(wildcard ./builtunitetest.test))
158156
$(GOTESTSUM) --raw-command -- $(GOCMD) tool test2json -p "./..." -t ./builtunitetest.test -test.v -test.failfast -test.timeout $(GOTEST_TIMEOUT)
159-
endif
157+
endif
160158

161159
.PHONY: mod-integration-test
162160
mod-integration-test: $(GOTESTSUM)
163161
@echo "running $(GOCMD) integration test ./... in `pwd`"
164162
$(GOTESTSUM) $(GOTESTSUM_OPT) --packages="./..." -- $(GOTEST_OPT_WITH_INTEGRATION)
165-
$(GOTESTSUM) $(GOTESTSUM_OPT) --packages="./..." -- $(GOTEST_OPT_WITH_INTEGRATION_SUDO)
166163
@if [ -e integration-coverage.txt ]; then \
167164
$(GOCMD) tool cover -html=integration-coverage.txt -o integration-coverage.html; \
168165
fi

‎cmd/telemetrygen/internal/e2etest/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetryge
33
go 1.22.7
44

55
require (
6-
github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetrygen v0.116.0
7-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.116.0
6+
github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetrygen v0.117.0
7+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.117.0
88
github.com/stretchr/testify v1.10.0
99
go.opentelemetry.io/collector/component/componenttest v0.117.0
1010
go.opentelemetry.io/collector/consumer/consumertest v0.117.0

‎exporter/googlecloudpubsubexporter/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
go.opentelemetry.io/collector/pdata v1.23.0
1818
go.uber.org/goleak v1.3.0
1919
go.uber.org/zap v1.27.0
20-
google.golang.org/api v0.215.0
20+
google.golang.org/api v0.216.0
2121
google.golang.org/grpc v1.69.2
2222
)
2323

@@ -74,14 +74,14 @@ require (
7474
go.uber.org/multierr v1.11.0 // indirect
7575
golang.org/x/crypto v0.31.0 // indirect
7676
golang.org/x/net v0.33.0 // indirect
77-
golang.org/x/oauth2 v0.24.0 // indirect
77+
golang.org/x/oauth2 v0.25.0 // indirect
7878
golang.org/x/sync v0.10.0 // indirect
7979
golang.org/x/sys v0.28.0 // indirect
8080
golang.org/x/text v0.21.0 // indirect
81-
golang.org/x/time v0.8.0 // indirect
81+
golang.org/x/time v0.9.0 // indirect
8282
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
8383
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
84-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect
84+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d // indirect
8585
google.golang.org/protobuf v1.36.2 // indirect
8686
gopkg.in/yaml.v3 v3.0.1 // indirect
8787
)

‎exporter/googlecloudpubsubexporter/go.sum

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎extension/cgroupruntimeextension/go.mod

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ go 1.22.4
44

55
require (
66
github.com/KimMachineGun/automemlimit v0.7.0
7-
github.com/containerd/cgroups/v3 v3.0.5
87
github.com/rdforte/gomaxecs v1.1.0
98
github.com/stretchr/testify v1.10.0
109
go.opentelemetry.io/collector/component v0.117.0
@@ -15,29 +14,23 @@ require (
1514
go.uber.org/automaxprocs v1.6.0
1615
go.uber.org/goleak v1.3.0
1716
go.uber.org/zap v1.27.0
18-
golang.org/x/sys v0.29.0
1917
)
2018

2119
require (
22-
github.com/cilium/ebpf v0.16.0 // indirect
23-
github.com/containerd/log v0.1.0 // indirect
24-
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
2520
github.com/davecgh/go-spew v1.1.1 // indirect
2621
github.com/go-logr/logr v1.4.2 // indirect
2722
github.com/go-logr/stdr v1.2.2 // indirect
2823
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
29-
github.com/godbus/dbus/v5 v5.1.0 // indirect
3024
github.com/gogo/protobuf v1.3.2 // indirect
3125
github.com/google/uuid v1.6.0 // indirect
3226
github.com/knadh/koanf/maps v0.1.1 // indirect
3327
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
3428
github.com/knadh/koanf/v2 v2.1.2 // indirect
3529
github.com/mitchellh/copystructure v1.2.0 // indirect
3630
github.com/mitchellh/reflectwalk v1.0.2 // indirect
37-
github.com/opencontainers/runtime-spec v1.2.0 // indirect
3831
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
3932
github.com/pmezard/go-difflib v1.0.0 // indirect
40-
github.com/sirupsen/logrus v1.9.3 // indirect
33+
github.com/rogpeppe/go-internal v1.11.0 // indirect
4134
go.opentelemetry.io/collector/config/configtelemetry v0.117.0 // indirect
4235
go.opentelemetry.io/collector/pdata v1.23.0 // indirect
4336
go.opentelemetry.io/otel v1.32.0 // indirect
@@ -46,8 +39,8 @@ require (
4639
go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
4740
go.opentelemetry.io/otel/trace v1.32.0 // indirect
4841
go.uber.org/multierr v1.11.0 // indirect
49-
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
5042
golang.org/x/net v0.33.0 // indirect
43+
golang.org/x/sys v0.29.0 // indirect
5144
golang.org/x/text v0.21.0 // indirect
5245
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
5346
google.golang.org/grpc v1.69.2 // indirect

0 commit comments

Comments
 (0)