Skip to content

Commit 307fb2d

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

File tree

26 files changed

+104
-7
lines changed

26 files changed

+104
-7
lines changed
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: configtls
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/configtls 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/configtls"
47+
schedule:
48+
interval: "weekly"
49+
day: "wednesday"
4550
- package-ecosystem: "gomod"
4651
directory: "/confmap"
4752
schedule:

cmd/builder/test/core.builder.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ replaces:
2727
- go.opentelemetry.io/collector/config/confignet => ${WORKSPACE_DIR}/config/confignet
2828
- go.opentelemetry.io/collector/config/configopaque => ${WORKSPACE_DIR}/config/configopaque
2929
# - go.opentelemetry.io/collector/config/configtelemetry => ${WORKSPACE_DIR}/config/configtelemetry
30-
# - go.opentelemetry.io/collector/config/configtls => ${WORKSPACE_DIR}/config/configtls
30+
- 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
3333
- go.opentelemetry.io/collector/connector => ${WORKSPACE_DIR}/connector

cmd/otelcorecol/builder-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ replaces:
3030
- go.opentelemetry.io/collector/config/confignet => ../../config/confignet
3131
- go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque
3232
# - go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry
33-
# - go.opentelemetry.io/collector/config/configtls => ../../config/configtls
33+
- go.opentelemetry.io/collector/config/configtls => ../../config/configtls
3434
- go.opentelemetry.io/collector/confmap => ../../confmap
3535
- go.opentelemetry.io/collector/consumer => ../../consumer
3636
- go.opentelemetry.io/collector/connector => ../../connector

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/configtls v0.0.0-00010101000000-000000000000 // indirect
7778
go.opentelemetry.io/collector/confmap v0.79.0 // indirect
7879
go.opentelemetry.io/collector/consumer v0.79.0 // indirect
7980
go.opentelemetry.io/collector/extension/auth v0.0.0-00010101000000-000000000000 // indirect
@@ -114,6 +115,8 @@ replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet
114115

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

118+
replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls
119+
117120
replace go.opentelemetry.io/collector/confmap => ../../confmap
118121

119122
replace go.opentelemetry.io/collector/consumer => ../../consumer

component/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,5 @@ replace go.opentelemetry.io/collector/config/configcompression => ../config/conf
7070
replace go.opentelemetry.io/collector/config/confignet => ../config/confignet
7171

7272
replace go.opentelemetry.io/collector/config/configopaque => ../config/configopaque
73+
74+
replace go.opentelemetry.io/collector/config/configtls => ../config/configtls

config/configtls/Makefile

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

config/configtls/go.mod

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
module go.opentelemetry.io/collector/config/configtls
2+
3+
go 1.19
4+
5+
require (
6+
github.com/fsnotify/fsnotify v1.6.0
7+
github.com/stretchr/testify v1.8.4
8+
go.opentelemetry.io/collector/config/configopaque v0.0.0-00010101000000-000000000000
9+
)
10+
11+
require (
12+
github.com/davecgh/go-spew v1.1.1 // indirect
13+
github.com/pmezard/go-difflib v1.0.0 // indirect
14+
golang.org/x/sys v0.0.0-20220908164124-27713097b956 // indirect
15+
gopkg.in/yaml.v3 v3.0.1 // indirect
16+
)
17+
18+
replace go.opentelemetry.io/collector/config/configopaque => ../configopaque

config/configtls/go.sum

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
2+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3+
github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
4+
github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
5+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
6+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
7+
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
8+
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
9+
golang.org/x/sys v0.0.0-20220908164124-27713097b956 h1:XeJjHH1KiLpKGb6lvMiksZ9l0fVUh+AmGcm0nOMEBOY=
10+
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
11+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
12+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
13+
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
14+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

connector/forwardconnector/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,3 +78,5 @@ replace go.opentelemetry.io/collector/config/configcompression => ../../config/c
7878
replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet
7979

8080
replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque
81+
82+
replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls

connector/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,5 @@ replace go.opentelemetry.io/collector/config/configcompression => ../config/conf
7070
replace go.opentelemetry.io/collector/config/confignet => ../config/confignet
7171

7272
replace go.opentelemetry.io/collector/config/configopaque => ../config/configopaque
73+
74+
replace go.opentelemetry.io/collector/config/configtls => ../config/configtls

consumer/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,5 @@ replace go.opentelemetry.io/collector/config/configcompression => ../config/conf
6363
replace go.opentelemetry.io/collector/config/confignet => ../config/confignet
6464

6565
replace go.opentelemetry.io/collector/config/configopaque => ../config/configopaque
66+
67+
replace go.opentelemetry.io/collector/config/configtls => ../config/configtls

exporter/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,3 +95,5 @@ replace go.opentelemetry.io/collector/config/configcompression => ../config/conf
9595
replace go.opentelemetry.io/collector/config/confignet => ../config/confignet
9696

9797
replace go.opentelemetry.io/collector/config/configopaque => ../config/configopaque
98+
99+
replace go.opentelemetry.io/collector/config/configtls => ../config/configtls

exporter/loggingexporter/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,3 +84,5 @@ replace go.opentelemetry.io/collector/config/configcompression => ../../config/c
8484
replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet
8585

8686
replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque
87+
88+
replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls

exporter/otlpexporter/go.mod

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ require (
88
go.opentelemetry.io/collector/component v0.79.0
99
go.opentelemetry.io/collector/config/configcompression v0.0.0-00010101000000-000000000000
1010
go.opentelemetry.io/collector/config/configopaque v0.0.0-00010101000000-000000000000
11+
go.opentelemetry.io/collector/config/configtls v0.0.0-00010101000000-000000000000
1112
go.opentelemetry.io/collector/confmap v0.79.0
1213
go.opentelemetry.io/collector/consumer v0.79.0
1314
go.opentelemetry.io/collector/exporter v0.79.0
@@ -68,6 +69,8 @@ replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet
6869

6970
replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque
7071

72+
replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls
73+
7174
replace go.opentelemetry.io/collector/confmap => ../../confmap
7275

7376
replace go.opentelemetry.io/collector/exporter => ../

exporter/otlphttpexporter/go.mod

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ require (
88
go.opentelemetry.io/collector/component v0.79.0
99
go.opentelemetry.io/collector/config/configcompression v0.0.0-00010101000000-000000000000
1010
go.opentelemetry.io/collector/config/configopaque v0.0.0-00010101000000-000000000000
11+
go.opentelemetry.io/collector/config/configtls v0.0.0-00010101000000-000000000000
1112
go.opentelemetry.io/collector/confmap v0.79.0
1213
go.opentelemetry.io/collector/consumer v0.79.0
1314
go.opentelemetry.io/collector/exporter v0.79.0
@@ -71,8 +72,12 @@ replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet
7172

7273
replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque
7374

75+
replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls
76+
7477
replace go.opentelemetry.io/collector/confmap => ../../confmap
7578

79+
replace go.opentelemetry.io/collector/connector => ../../connector
80+
7681
replace go.opentelemetry.io/collector/exporter => ../
7782

7883
replace go.opentelemetry.io/collector/extension => ../../extension
@@ -101,5 +106,3 @@ retract (
101106
)
102107

103108
replace cloud.google.com/go => cloud.google.com/go v0.110.2
104-
105-
replace go.opentelemetry.io/collector/connector => ../../connector

extension/auth/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,5 @@ replace go.opentelemetry.io/collector/config/configcompression => ../../config/c
6767
replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet
6868

6969
replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque
70+
71+
replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls

extension/ballastextension/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,5 @@ replace go.opentelemetry.io/collector/config/configcompression => ../../config/c
8181
replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet
8282

8383
replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque
84+
85+
replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls

extension/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,5 @@ replace go.opentelemetry.io/collector/config/configcompression => ../config/conf
6666
replace go.opentelemetry.io/collector/config/confignet => ../config/confignet
6767

6868
replace go.opentelemetry.io/collector/config/configopaque => ../config/configopaque
69+
70+
replace go.opentelemetry.io/collector/config/configtls => ../config/configtls

extension/zpagesextension/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,5 @@ retract (
7777
replace go.opentelemetry.io/collector/connector => ../../connector
7878

7979
replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque
80+
81+
replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls

go.mod

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ go 1.19
44

55
require (
66
contrib.go.opencensus.io/exporter/prometheus v0.4.2
7-
github.com/fsnotify/fsnotify v1.6.0
87
github.com/golang/snappy v0.0.4
98
github.com/google/uuid v1.3.0
109
github.com/klauspost/compress v1.16.6
@@ -21,6 +20,7 @@ require (
2120
go.opentelemetry.io/collector/config/configcompression v0.0.0-00010101000000-000000000000
2221
go.opentelemetry.io/collector/config/confignet v0.0.0-00010101000000-000000000000
2322
go.opentelemetry.io/collector/config/configopaque v0.0.0-00010101000000-000000000000
23+
go.opentelemetry.io/collector/config/configtls v0.0.0-00010101000000-000000000000
2424
go.opentelemetry.io/collector/confmap v0.79.0
2525
go.opentelemetry.io/collector/connector v0.0.0-00010101000000-000000000000
2626
go.opentelemetry.io/collector/consumer v0.79.0
@@ -59,6 +59,7 @@ require (
5959
github.com/cespare/xxhash/v2 v2.2.0 // indirect
6060
github.com/davecgh/go-spew v1.1.1 // indirect
6161
github.com/felixge/httpsnoop v1.0.3 // indirect
62+
github.com/fsnotify/fsnotify v1.6.0 // indirect
6263
github.com/go-kit/log v0.2.1 // indirect
6364
github.com/go-logfmt/logfmt v0.5.1 // indirect
6465
github.com/go-logr/logr v1.2.4 // indirect
@@ -104,6 +105,8 @@ replace go.opentelemetry.io/collector/config/confignet => ./config/confignet
104105

105106
replace go.opentelemetry.io/collector/config/configopaque => ./config/configopaque
106107

108+
replace go.opentelemetry.io/collector/config/configtls => ./config/configtls
109+
107110
replace go.opentelemetry.io/collector/connector => ./connector
108111

109112
replace go.opentelemetry.io/collector/consumer => ./consumer

processor/batchprocessor/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,3 +99,5 @@ replace go.opentelemetry.io/collector/config/configcompression => ../../config/c
9999
replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet
100100

101101
replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque
102+
103+
replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls

processor/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,5 @@ replace go.opentelemetry.io/collector/config/configcompression => ../config/conf
7171
replace go.opentelemetry.io/collector/config/confignet => ../config/confignet
7272

7373
replace go.opentelemetry.io/collector/config/configopaque => ../config/configopaque
74+
75+
replace go.opentelemetry.io/collector/config/configtls => ../config/configtls

processor/memorylimiterprocessor/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,3 +88,5 @@ replace go.opentelemetry.io/collector/config/configcompression => ../../config/c
8888
replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet
8989

9090
replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque
91+
92+
replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls

receiver/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,3 +93,5 @@ replace go.opentelemetry.io/collector/config/configcompression => ../config/conf
9393
replace go.opentelemetry.io/collector/config/confignet => ../config/confignet
9494

9595
replace go.opentelemetry.io/collector/config/configopaque => ../config/configopaque
96+
97+
replace go.opentelemetry.io/collector/config/configtls => ../config/configtls

receiver/otlpreceiver/go.mod

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ require (
88
go.opentelemetry.io/collector v0.79.0
99
go.opentelemetry.io/collector/component v0.79.0
1010
go.opentelemetry.io/collector/config/confignet v0.0.0-00010101000000-000000000000
11+
go.opentelemetry.io/collector/config/configtls v0.0.0-00010101000000-000000000000
1112
go.opentelemetry.io/collector/confmap v0.79.0
1213
go.opentelemetry.io/collector/consumer v0.79.0
1314
go.opentelemetry.io/collector/pdata v1.0.0-rcv0012
@@ -86,8 +87,12 @@ replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet
8687

8788
replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque
8889

90+
replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls
91+
8992
replace go.opentelemetry.io/collector/confmap => ../../confmap
9093

94+
replace go.opentelemetry.io/collector/connector => ../../connector
95+
9196
replace go.opentelemetry.io/collector/exporter => ../../exporter
9297

9398
replace go.opentelemetry.io/collector/extension => ../../extension
@@ -112,5 +117,3 @@ retract (
112117
v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module, use v0.76.1
113118
v0.69.0 // Release failed, use v0.69.1
114119
)
115-
116-
replace go.opentelemetry.io/collector/connector => ../../connector

0 commit comments

Comments
 (0)