Skip to content

Commit cbb3d56

Browse files
djaglowskidjaglowski
authored
Merge branch 'main' into module-info-builder
2 parents 70a9553 + 75aeab0 commit cbb3d56

File tree

62 files changed

+175
-125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+175
-125
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ concurrency:
2323
jobs:
2424
arm-unittest-matrix:
2525
if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run ARM') || github.event_name == 'push' || github.event_name == 'merge_group') }}
26-
runs-on: macos-14
26+
runs-on: otel-linux-arm64
2727
steps:
2828
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
2929
- uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
@@ -49,7 +49,7 @@ jobs:
4949
run: make -j4 gotest
5050
arm-unittest:
5151
if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run ARM') || github.event_name == 'push' || github.event_name == 'merge_group') }}
52-
runs-on: macos-14
52+
runs-on: otel-linux-arm64
5353
needs: [arm-unittest-matrix]
5454
steps:
5555
- name: Print result

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ check-contrib:
290290
-replace go.opentelemetry.io/collector/extension/memorylimiterextension=$(CURDIR)/extension/memorylimiterextension \
291291
-replace go.opentelemetry.io/collector/extension/zpagesextension=$(CURDIR)/extension/zpagesextension \
292292
-replace go.opentelemetry.io/collector/featuregate=$(CURDIR)/featuregate \
293-
-replace go.opentelemetry.io/collector/internal/featuregates=$(CURDIR)/internal/featuregates \
293+
-replace go.opentelemetry.io/collector/internal/globalgates=$(CURDIR)/internal/globalgates \
294294
-replace go.opentelemetry.io/collector/otelcol=$(CURDIR)/otelcol \
295295
-replace go.opentelemetry.io/collector/otelcol/otelcoltest=$(CURDIR)/otelcol/otelcoltest \
296296
-replace go.opentelemetry.io/collector/pdata=$(CURDIR)/pdata \
@@ -349,7 +349,7 @@ restore-contrib:
349349
-dropreplace go.opentelemetry.io/collector/extension/memorylimiterextension \
350350
-dropreplace go.opentelemetry.io/collector/extension/zpagesextension \
351351
-dropreplace go.opentelemetry.io/collector/featuregate \
352-
-dropreplace go.opentelemetry.io/collector/internal/featuregates \
352+
-dropreplace go.opentelemetry.io/collector/internal/globalgates \
353353
-dropreplace go.opentelemetry.io/collector/otelcol \
354354
-dropreplace go.opentelemetry.io/collector/otelcol/otelcoltest \
355355
-dropreplace go.opentelemetry.io/collector/pdata \

‎cmd/builder/internal/builder/main_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ var (
6969
"/extension/auth",
7070
"/extension/zpagesextension",
7171
"/featuregate",
72-
"/internal/featuregates",
72+
"/internal/globalgates",
7373
"/processor",
7474
"/processor/batchprocessor",
7575
"/processor/memorylimiterprocessor",

‎cmd/builder/test/core.builder.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ replaces:
4646
- go.opentelemetry.io/collector/extension/auth => ${WORKSPACE_DIR}/extension/auth
4747
- go.opentelemetry.io/collector/extension/zpagesextension => ${WORKSPACE_DIR}/extension/zpagesextension
4848
- go.opentelemetry.io/collector/featuregate => ${WORKSPACE_DIR}/featuregate
49-
- go.opentelemetry.io/collector/internal/featuregates => ${WORKSPACE_DIR}/internal/featuregates
49+
- go.opentelemetry.io/collector/internal/globalgates => ${WORKSPACE_DIR}/internal/globalgates
5050
- go.opentelemetry.io/collector/otelcol => ${WORKSPACE_DIR}/otelcol
5151
- go.opentelemetry.io/collector/otelcol/otelcoltest => ${WORKSPACE_DIR}/otelcol/otelcoltest
5252
- go.opentelemetry.io/collector/pdata => ${WORKSPACE_DIR}/pdata

‎cmd/mdatagen/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ require (
4848
github.com/prometheus/common v0.55.0 // indirect
4949
github.com/prometheus/procfs v0.15.1 // indirect
5050
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
51-
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
51+
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
5252
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
5353
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
5454
go.uber.org/multierr v1.11.0 // indirect
@@ -92,4 +92,4 @@ retract (
9292

9393
replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile
9494

95-
replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates
95+
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates

‎cmd/otelcorecol/builder-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ providers:
4141

4242
replaces:
4343
- go.opentelemetry.io/collector => ../../
44-
- go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates
44+
- go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
4545
- go.opentelemetry.io/collector/otelcol => ../../otelcol
4646
- go.opentelemetry.io/collector/component => ../../component
4747
- go.opentelemetry.io/collector/config/configauth => ../../config/configauth

‎cmd/otelcorecol/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ require (
9494
go.opentelemetry.io/collector/consumer v0.104.0 // indirect
9595
go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect
9696
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
97-
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
97+
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
9898
go.opentelemetry.io/collector/pdata v1.11.0 // indirect
9999
go.opentelemetry.io/collector/semconv v0.104.0 // indirect
100100
go.opentelemetry.io/collector/service v0.104.0 // indirect
@@ -136,7 +136,7 @@ require (
136136

137137
replace go.opentelemetry.io/collector => ../../
138138

139-
replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates
139+
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
140140

141141
replace go.opentelemetry.io/collector/otelcol => ../../otelcol
142142

‎config/configauth/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ require (
2424
go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect
2525
go.opentelemetry.io/collector/confmap v0.104.0 // indirect
2626
go.opentelemetry.io/collector/featuregate v1.11.0 // indirect
27-
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
27+
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
2828
go.opentelemetry.io/collector/pdata v1.11.0 // indirect
2929
go.opentelemetry.io/otel v1.28.0 // indirect
3030
go.opentelemetry.io/otel/metric v1.28.0 // indirect
@@ -54,4 +54,4 @@ replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth
5454

5555
replace go.opentelemetry.io/collector/featuregate => ../../featuregate
5656

57-
replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates
57+
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates

‎config/configgrpc/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ require (
5454
github.com/prometheus/procfs v0.15.1 // indirect
5555
go.opentelemetry.io/collector/confmap v0.104.0 // indirect
5656
go.opentelemetry.io/collector/extension v0.104.0 // indirect
57-
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
57+
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
5858
go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect
5959
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
6060
go.opentelemetry.io/otel/metric v1.28.0 // indirect
@@ -72,7 +72,7 @@ require (
7272

7373
replace go.opentelemetry.io/collector => ../../
7474

75-
replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates
75+
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
7676

7777
replace go.opentelemetry.io/collector/config/configauth => ../configauth
7878

‎config/confighttp/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ require (
4949
github.com/prometheus/procfs v0.15.1 // indirect
5050
go.opentelemetry.io/collector/confmap v0.104.0 // indirect
5151
go.opentelemetry.io/collector/extension v0.104.0 // indirect
52-
go.opentelemetry.io/collector/internal/featuregates v0.0.0-20240705161705-b127da089038 // indirect
52+
go.opentelemetry.io/collector/internal/globalgates v0.0.0-20240705161705-b127da089038 // indirect
5353
go.opentelemetry.io/collector/pdata v1.11.0 // indirect
5454
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
5555
go.opentelemetry.io/otel/metric v1.28.0 // indirect
@@ -67,7 +67,7 @@ require (
6767

6868
replace go.opentelemetry.io/collector => ../../
6969

70-
replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates
70+
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
7171

7272
replace go.opentelemetry.io/collector/config/configauth => ../configauth
7373

0 commit comments

Comments
 (0)