Skip to content

Commit 71a86bb

Browse files
author
Alex Boten
committed
split extension into separate module
Fixes open-telemetry#7306 Signed-off-by: Alex Boten <[email protected]>
1 parent 64f3415 commit 71a86bb

File tree

26 files changed

+561
-14
lines changed

26 files changed

+561
-14
lines changed

‎.chloggen/codeboten_split-extension.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: enhancement
3+
4+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
5+
component: extension
6+
7+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8+
note: split extension module into its own module
9+
10+
# One or more tracking issues or pull requests related to the change
11+
issues: [7306]
12+
13+
# (Optional) One or more lines of additional information to render under the primary note.
14+
# These lines will be padded with 2 spaces and then inserted directly into the document.
15+
# Use pipe (|) for multiline entries.
16+
subtext:

‎.github/dependabot.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,11 @@ updates:
6262
schedule:
6363
interval: "weekly"
6464
day: "wednesday"
65+
- package-ecosystem: "gomod"
66+
directory: "/extension"
67+
schedule:
68+
interval: "weekly"
69+
day: "wednesday"
6570
- package-ecosystem: "gomod"
6671
directory: "/extension/ballastextension"
6772
schedule:

‎Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ check-contrib:
280280
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/exporter/loggingexporter=$(CURDIR)/exporter/loggingexporter"
281281
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/exporter/otlpexporter=$(CURDIR)/exporter/otlpexporter"
282282
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/exporter/otlphttpexporter=$(CURDIR)/exporter/otlphttpexporter"
283+
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/extension=$(CURDIR)/extension"
283284
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/extension/ballastextension=$(CURDIR)/extension/ballastextension"
284285
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/extension/zpagesextension=$(CURDIR)/extension/zpagesextension"
285286
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/featuregate=$(CURDIR)/featuregate"
@@ -308,6 +309,7 @@ restore-contrib:
308309
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/exporter/loggingexporter"
309310
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/exporter/otlpexporter"
310311
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/exporter/otlphttpexporter"
312+
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/extension"
311313
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/extension/ballastextension"
312314
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/extension/zpagestextension"
313315
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/featuregate"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ func TestGenerateAndCompile(t *testing.T) {
4949
fmt.Sprintf("go.opentelemetry.io/collector/exporter/loggingexporter => %s/exporter/loggingexporter", workspaceDir),
5050
fmt.Sprintf("go.opentelemetry.io/collector/exporter/otlpexporter => %s/exporter/otlpexporter", workspaceDir),
5151
fmt.Sprintf("go.opentelemetry.io/collector/exporter/otlphttpexporter => %s/exporter/otlphttpexporter", workspaceDir),
52+
fmt.Sprintf("go.opentelemetry.io/collector/extension => %s/extension", workspaceDir),
5253
fmt.Sprintf("go.opentelemetry.io/collector/extension/ballastextension => %s/extension/ballastextension", workspaceDir),
5354
fmt.Sprintf("go.opentelemetry.io/collector/extension/zpagesextension => %s/extension/zpagesextension", workspaceDir),
5455
fmt.Sprintf("go.opentelemetry.io/collector/featuregate => %s/featuregate", workspaceDir),

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ replaces:
2424
- go.opentelemetry.io/collector/consumer => ${WORKSPACE_DIR}/consumer
2525
- go.opentelemetry.io/collector/exporter => ${WORKSPACE_DIR}/exporter
2626
- go.opentelemetry.io/collector/exporter/loggingexporter => ${WORKSPACE_DIR}/exporter/loggingexporter
27+
- go.opentelemetry.io/collector/extension => ${WORKSPACE_DIR}/extension
2728
- go.opentelemetry.io/collector/extension/zpagesextension => ${WORKSPACE_DIR}/extension/zpagesextension
2829
- go.opentelemetry.io/collector/featuregate => ${WORKSPACE_DIR}/featuregate
2930
- go.opentelemetry.io/collector/receiver => ${WORKSPACE_DIR}/receiver

‎cmd/otelcorecol/builder-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ replaces:
3030
- go.opentelemetry.io/collector/exporter/loggingexporter => ../../exporter/loggingexporter
3131
- go.opentelemetry.io/collector/exporter/otlpexporter => ../../exporter/otlpexporter
3232
- go.opentelemetry.io/collector/exporter/otlphttpexporter => ../../exporter/otlphttpexporter
33+
- go.opentelemetry.io/collector/extension => ../../extension
3334
- go.opentelemetry.io/collector/extension/ballastextension => ../../extension/ballastextension
3435
- go.opentelemetry.io/collector/extension/zpagesextension => ../../extension/zpagesextension
3536
- go.opentelemetry.io/collector/featuregate => ../../featuregate

‎cmd/otelcorecol/go.mod

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ require (
1313
go.opentelemetry.io/collector/exporter/loggingexporter v0.79.0
1414
go.opentelemetry.io/collector/exporter/otlpexporter v0.79.0
1515
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.79.0
16+
go.opentelemetry.io/collector/extension v0.0.0-00010101000000-000000000000
1617
go.opentelemetry.io/collector/extension/ballastextension v0.79.0
1718
go.opentelemetry.io/collector/extension/zpagesextension v0.79.0
1819
go.opentelemetry.io/collector/processor v0.0.0-00010101000000-000000000000
@@ -116,6 +117,8 @@ replace go.opentelemetry.io/collector/exporter/otlpexporter => ../../exporter/ot
116117

117118
replace go.opentelemetry.io/collector/exporter/otlphttpexporter => ../../exporter/otlphttpexporter
118119

120+
replace go.opentelemetry.io/collector/extension => ../../extension
121+
119122
replace go.opentelemetry.io/collector/extension/ballastextension => ../../extension/ballastextension
120123

121124
replace go.opentelemetry.io/collector/extension/zpagesextension => ../../extension/zpagesextension

‎component/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ replace go.opentelemetry.io/collector/consumer => ../consumer
4242

4343
replace go.opentelemetry.io/collector/exporter => ../exporter
4444

45+
replace go.opentelemetry.io/collector/extension => ../extension
46+
4547
replace go.opentelemetry.io/collector/featuregate => ../featuregate
4648

4749
replace go.opentelemetry.io/collector/pdata => ../pdata

‎connector/forwardconnector/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ replace go.opentelemetry.io/collector/component => ../../component
4545

4646
replace go.opentelemetry.io/collector/exporter => ../../exporter
4747

48+
replace go.opentelemetry.io/collector/extension => ../../extension
49+
4850
replace go.opentelemetry.io/collector/pdata => ../../pdata
4951

5052
replace go.opentelemetry.io/collector/processor => ../../processor

‎consumer/go.mod

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,18 @@ require (
2929

3030
replace go.opentelemetry.io/collector => ../
3131

32+
replace go.opentelemetry.io/collector/component => ../component
33+
34+
replace go.opentelemetry.io/collector/confmap => ../confmap
35+
3236
replace go.opentelemetry.io/collector/exporter => ../exporter
3337

38+
replace go.opentelemetry.io/collector/extension => ../extension
39+
40+
replace go.opentelemetry.io/collector/extension/zpagesextension => ../extension/zpagesextension
41+
42+
replace go.opentelemetry.io/collector/featuregate => ../featuregate
43+
3444
replace go.opentelemetry.io/collector/pdata => ../pdata
3545

3646
replace go.opentelemetry.io/collector/processor => ../processor
@@ -39,14 +49,6 @@ replace go.opentelemetry.io/collector/receiver => ../receiver
3949

4050
replace go.opentelemetry.io/collector/semconv => ../semconv
4151

42-
replace go.opentelemetry.io/collector/extension/zpagesextension => ../extension/zpagesextension
43-
44-
replace go.opentelemetry.io/collector/component => ../component
45-
46-
replace go.opentelemetry.io/collector/featuregate => ../featuregate
47-
48-
replace go.opentelemetry.io/collector/confmap => ../confmap
49-
5052
retract (
5153
v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module, use v0.76.1
5254
v0.69.0 // Release failed, use v0.69.1

0 commit comments

Comments
 (0)