Skip to content

Commit ec26510

Browse files
author
Alex Boten
committed
Split config/configtelemetry into its own module
Part of open-telemetry#7895 Signed-off-by: Alex Boten <[email protected]>
1 parent ca22f12 commit ec26510

File tree

31 files changed

+104
-85
lines changed

31 files changed

+104
-85
lines changed

‎.chloggen/codeboten_split-config-mod-telemetry.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: configtelemetry
6+
7+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8+
note: Split config/configtelemetry into its own module
9+
10+
# One or more tracking issues or pull requests related to the change
11+
issues: [7895]
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
@@ -42,6 +42,11 @@ updates:
4242
schedule:
4343
interval: "weekly"
4444
day: "wednesday"
45+
- package-ecosystem: "gomod"
46+
directory: "/config/configtelemetry"
47+
schedule:
48+
interval: "weekly"
49+
day: "wednesday"
4550
- package-ecosystem: "gomod"
4651
directory: "/config/configtls"
4752
schedule:

‎Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ check-contrib:
277277
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/config/configcompression=$(CURDIR)/config/configcompression"
278278
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/config/confignet=$(CURDIR)/config/confignet"
279279
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/config/configopaque=$(CURDIR)/config/configopaque"
280+
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/config/configtelemetry=$(CURDIR)/config/configtelemetry"
280281
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/config/configtls=$(CURDIR)/config/configtls"
281282
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/confmap=$(CURDIR)/confmap"
282283
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/consumer=$(CURDIR)/consumer"
@@ -311,6 +312,7 @@ restore-contrib:
311312
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/config/configcompression"
312313
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/config/confignet"
313314
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/config/configopaque"
315+
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/config/configtelemetry"
314316
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/config/configtls"
315317
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/confmap"
316318
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/consumer"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ func TestGenerateAndCompile(t *testing.T) {
4444
replaces := []string{fmt.Sprintf("go.opentelemetry.io/collector => %s", workspaceDir),
4545
fmt.Sprintf("go.opentelemetry.io/collector/component => %s/component", workspaceDir),
4646
fmt.Sprintf("go.opentelemetry.io/collector/config/confignet => %s/config/confignet", workspaceDir),
47+
fmt.Sprintf("go.opentelemetry.io/collector/config/configtelemetry => %s/config/configtelemetry", workspaceDir),
4748
fmt.Sprintf("go.opentelemetry.io/collector/confmap => %s/confmap", workspaceDir),
4849
fmt.Sprintf("go.opentelemetry.io/collector/consumer => %s/consumer", workspaceDir),
4950
fmt.Sprintf("go.opentelemetry.io/collector/connector => %s/connector", workspaceDir),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ replaces:
2626
# - go.opentelemetry.io/collector/config/confighttp => ${WORKSPACE_DIR}/config/confighttp
2727
- go.opentelemetry.io/collector/config/confignet => ${WORKSPACE_DIR}/config/confignet
2828
- go.opentelemetry.io/collector/config/configopaque => ${WORKSPACE_DIR}/config/configopaque
29-
# - go.opentelemetry.io/collector/config/configtelemetry => ${WORKSPACE_DIR}/config/configtelemetry
29+
- go.opentelemetry.io/collector/config/configtelemetry => ${WORKSPACE_DIR}/config/configtelemetry
3030
- go.opentelemetry.io/collector/config/configtls => ${WORKSPACE_DIR}/config/configtls
3131
- go.opentelemetry.io/collector/confmap => ${WORKSPACE_DIR}/confmap
3232
- go.opentelemetry.io/collector/consumer => ${WORKSPACE_DIR}/consumer

‎cmd/otelcorecol/builder-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ replaces:
2929
# - go.opentelemetry.io/collector/config/confighttp => ../../config/confighttp
3030
- go.opentelemetry.io/collector/config/confignet => ../../config/confignet
3131
- go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque
32-
# - go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry
32+
- go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry
3333
- go.opentelemetry.io/collector/config/configtls => ../../config/configtls
3434
- go.opentelemetry.io/collector/confmap => ../../confmap
3535
- go.opentelemetry.io/collector/consumer => ../../consumer

‎cmd/otelcorecol/go.mod

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ require (
7474
go.opentelemetry.io/collector/config/configcompression v0.0.0-00010101000000-000000000000 // indirect
7575
go.opentelemetry.io/collector/config/confignet v0.0.0-00010101000000-000000000000 // indirect
7676
go.opentelemetry.io/collector/config/configopaque v0.0.0-00010101000000-000000000000 // indirect
77+
go.opentelemetry.io/collector/config/configtelemetry v0.0.0-00010101000000-000000000000 // indirect
7778
go.opentelemetry.io/collector/config/configtls v0.0.0-00010101000000-000000000000 // indirect
7879
go.opentelemetry.io/collector/confmap v0.79.0 // indirect
7980
go.opentelemetry.io/collector/consumer v0.79.0 // indirect
@@ -115,6 +116,8 @@ replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet
115116

116117
replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque
117118

119+
replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry
120+
118121
replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls
119122

120123
replace go.opentelemetry.io/collector/confmap => ../../confmap

‎component/go.mod

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.19
44

55
require (
66
github.com/stretchr/testify v1.8.4
7-
go.opentelemetry.io/collector v0.79.0
7+
go.opentelemetry.io/collector/config/configtelemetry v0.0.0-00010101000000-000000000000
88
go.opentelemetry.io/collector/confmap v0.79.0
99
go.opentelemetry.io/collector/pdata v1.0.0-rcv0012
1010
go.opentelemetry.io/otel/metric v1.16.0
@@ -14,6 +14,7 @@ require (
1414
)
1515

1616
require (
17+
github.com/benbjohnson/clock v1.3.0 // indirect
1718
github.com/davecgh/go-spew v1.1.1 // indirect
1819
github.com/gogo/protobuf v1.3.2 // indirect
1920
github.com/golang/protobuf v1.5.3 // indirect
@@ -34,41 +35,15 @@ require (
3435
gopkg.in/yaml.v3 v3.0.1 // indirect
3536
)
3637

37-
replace go.opentelemetry.io/collector => ../
38+
replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry
3839

3940
replace go.opentelemetry.io/collector/confmap => ../confmap
4041

41-
replace go.opentelemetry.io/collector/consumer => ../consumer
42-
43-
replace go.opentelemetry.io/collector/exporter => ../exporter
44-
45-
replace go.opentelemetry.io/collector/extension => ../extension
46-
47-
replace go.opentelemetry.io/collector/extension/auth => ../extension/auth
48-
4942
replace go.opentelemetry.io/collector/featuregate => ../featuregate
5043

5144
replace go.opentelemetry.io/collector/pdata => ../pdata
5245

53-
replace go.opentelemetry.io/collector/processor => ../processor
54-
55-
replace go.opentelemetry.io/collector/receiver => ../receiver
56-
57-
replace go.opentelemetry.io/collector/semconv => ../semconv
58-
59-
replace go.opentelemetry.io/collector/extension/zpagesextension => ../extension/zpagesextension
60-
6146
retract (
6247
v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module, use v0.76.1
6348
v0.69.0 // Release failed, use v0.69.1
6449
)
65-
66-
replace go.opentelemetry.io/collector/connector => ../connector
67-
68-
replace go.opentelemetry.io/collector/config/configcompression => ../config/configcompression
69-
70-
replace go.opentelemetry.io/collector/config/confignet => ../config/confignet
71-
72-
replace go.opentelemetry.io/collector/config/configopaque => ../config/configopaque
73-
74-
replace go.opentelemetry.io/collector/config/configtls => ../config/configtls

‎component/go.sum

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ github.com/aws/aws-sdk-go-v2/service/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+
2222
github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21TfrhJ8AEMzVybRNSb/b4g=
2323
github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
2424
github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
25+
github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
2526
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
2627
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
2728
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=

‎config/configtelemetry/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
include ../../Makefile.Common

0 commit comments

Comments
 (0)