Skip to content

Commit c0b211f

Browse files
author
Alex Boten
committed
split configgrpc, confighttp, and config/internal
These are the last of the config packages. Fixes open-telemetry#7895 Signed-off-by: Alex Boten <[email protected]>
1 parent c755bd3 commit c0b211f

File tree

36 files changed

+3550
-377
lines changed

36 files changed

+3550
-377
lines changed

‎.github/dependabot.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,16 @@ updates:
3737
schedule:
3838
interval: "weekly"
3939
day: "wednesday"
40+
- package-ecosystem: "gomod"
41+
directory: "/config/configgrpc"
42+
schedule:
43+
interval: "weekly"
44+
day: "wednesday"
45+
- package-ecosystem: "gomod"
46+
directory: "/config/confighttp"
47+
schedule:
48+
interval: "weekly"
49+
day: "wednesday"
4050
- package-ecosystem: "gomod"
4151
directory: "/config/confignet"
4252
schedule:
@@ -57,6 +67,11 @@ updates:
5767
schedule:
5868
interval: "weekly"
5969
day: "wednesday"
70+
- package-ecosystem: "gomod"
71+
directory: "/config/internal"
72+
schedule:
73+
interval: "weekly"
74+
day: "wednesday"
6075
- package-ecosystem: "gomod"
6176
directory: "/confmap"
6277
schedule:

‎Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,8 @@ check-contrib:
276276
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/component=$(CURDIR)/component"
277277
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/config/configauth=$(CURDIR)/config/configauth"
278278
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/config/configcompression=$(CURDIR)/config/configcompression"
279+
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/config/configgrpc=$(CURDIR)/config/configgrpc"
280+
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/config/confighttp=$(CURDIR)/config/confighttp"
279281
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/config/confignet=$(CURDIR)/config/confignet"
280282
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/config/configopaque=$(CURDIR)/config/configopaque"
281283
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/config/configtelemetry=$(CURDIR)/config/configtelemetry"
@@ -311,6 +313,8 @@ restore-contrib:
311313
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector"
312314
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/component"
313315
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/config/configcompression"
316+
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/config/configgrpc"
317+
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/config/confighttp"
314318
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/config/confignet"
315319
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/config/configopaque"
316320
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/config/configtelemetry"

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ replaces:
2222
- go.opentelemetry.io/collector/component => ${WORKSPACE_DIR}/component
2323
- go.opentelemetry.io/collector/config/configauth => ${WORKSPACE_DIR}/config/configauth
2424
- go.opentelemetry.io/collector/config/configcompression => ${WORKSPACE_DIR}/config/configcompression
25-
# - go.opentelemetry.io/collector/config/configgrpc => ${WORKSPACE_DIR}/config/configgrpc
26-
# - go.opentelemetry.io/collector/config/confighttp => ${WORKSPACE_DIR}/config/confighttp
25+
- go.opentelemetry.io/collector/config/configgrpc => ${WORKSPACE_DIR}/config/configgrpc
26+
- 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
2929
- go.opentelemetry.io/collector/config/configtelemetry => ${WORKSPACE_DIR}/config/configtelemetry
3030
- go.opentelemetry.io/collector/config/configtls => ${WORKSPACE_DIR}/config/configtls
31+
- go.opentelemetry.io/collector/config/internal => ${WORKSPACE_DIR}/config/internal
3132
- go.opentelemetry.io/collector/confmap => ${WORKSPACE_DIR}/confmap
3233
- go.opentelemetry.io/collector/consumer => ${WORKSPACE_DIR}/consumer
3334
- go.opentelemetry.io/collector/connector => ${WORKSPACE_DIR}/connector

‎cmd/otelcorecol/builder-config.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,13 @@ replaces:
2525
- go.opentelemetry.io/collector/component => ../../component
2626
- go.opentelemetry.io/collector/config/configauth => ../../config/configauth
2727
- go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression
28-
# - go.opentelemetry.io/collector/config/configgrpc => ../../config/configgrpc
29-
# - go.opentelemetry.io/collector/config/confighttp => ../../config/confighttp
28+
- go.opentelemetry.io/collector/config/configgrpc => ../../config/configgrpc
29+
- 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
3232
- go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry
3333
- go.opentelemetry.io/collector/config/configtls => ../../config/configtls
34+
- go.opentelemetry.io/collector/config/internal => ../../config/internal
3435
- go.opentelemetry.io/collector/confmap => ../../confmap
3536
- go.opentelemetry.io/collector/consumer => ../../consumer
3637
- go.opentelemetry.io/collector/connector => ../../connector

‎cmd/otelcorecol/go.mod

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,13 @@ require (
7373
go.opencensus.io v0.24.0 // indirect
7474
go.opentelemetry.io/collector/config/configauth v0.0.0-00010101000000-000000000000 // indirect
7575
go.opentelemetry.io/collector/config/configcompression v0.0.0-00010101000000-000000000000 // indirect
76+
go.opentelemetry.io/collector/config/configgrpc v0.0.0-00010101000000-000000000000 // indirect
77+
go.opentelemetry.io/collector/config/confighttp v0.0.0-00010101000000-000000000000 // indirect
7678
go.opentelemetry.io/collector/config/confignet v0.0.0-00010101000000-000000000000 // indirect
7779
go.opentelemetry.io/collector/config/configopaque v0.0.0-00010101000000-000000000000 // indirect
7880
go.opentelemetry.io/collector/config/configtelemetry v0.0.0-00010101000000-000000000000 // indirect
7981
go.opentelemetry.io/collector/config/configtls v0.0.0-00010101000000-000000000000 // indirect
82+
go.opentelemetry.io/collector/config/internal v0.0.0-00010101000000-000000000000 // indirect
8083
go.opentelemetry.io/collector/confmap v0.79.0 // indirect
8184
go.opentelemetry.io/collector/consumer v0.79.0 // indirect
8285
go.opentelemetry.io/collector/extension/auth v0.0.0-20230615165320-df20186ee21c // indirect
@@ -115,6 +118,10 @@ replace go.opentelemetry.io/collector/config/configauth => ../../config/configau
115118

116119
replace go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression
117120

121+
replace go.opentelemetry.io/collector/config/configgrpc => ../../config/configgrpc
122+
123+
replace go.opentelemetry.io/collector/config/confighttp => ../../config/confighttp
124+
118125
replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet
119126

120127
replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque
@@ -123,6 +130,8 @@ replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/con
123130

124131
replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls
125132

133+
replace go.opentelemetry.io/collector/config/internal => ../../config/internal
134+
126135
replace go.opentelemetry.io/collector/confmap => ../../confmap
127136

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

‎cmd/otelcorecol/go.sum

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ cloud.google.com/go/compute v1.20.0 h1:cUOcywWuowO9It2i1KX1lIb0HH7gLv6nENKuZGnlc
134134
cloud.google.com/go/compute/metadata v0.1.0/go.mod h1:Z1VN+bulIf6bt4P/C37K4DyZYZEXYonfTBHHFPO/4UU=
135135
cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
136136
cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM=
137+
cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
137138
cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
138-
cloud.google.com/go/compute/metadata v0.2.4-0.20230602132616-4d8f0906c19e h1:z/a5tZBezfqvvTKKQip7tDOwKvakW7DvPkiS5d5Y37Q=
139139
cloud.google.com/go/contactcenterinsights v1.3.0/go.mod h1:Eu2oemoePuEFc/xKFPjbTuPSj0fYJcPls9TFlPNnHHY=
140140
cloud.google.com/go/contactcenterinsights v1.4.0/go.mod h1:L2YzkGbPsv+vMQMCADxJoT9YiTTnSEd6fEvCeHTYVck=
141141
cloud.google.com/go/contactcenterinsights v1.6.0/go.mod h1:IIDlT6CLcDoyv79kDv8iWxMSTZhLxSCofVV5W6YFM/w=

‎config/configauth/go.sum

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -246,12 +246,6 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1
246246
go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=
247247
go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
248248
go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY=
249-
go.opentelemetry.io/collector/confmap v0.79.0 h1:a4XVde3lLP81BiSbt8AzVD6pvQBX8YkrB9ZtMSHKv1A=
250-
go.opentelemetry.io/collector/confmap v0.79.0/go.mod h1:cKr2c7lVtEJCuMOncUPlcROJBbTFaHiPjYp1Y8RbL+Q=
251-
go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 h1:pSO81lfikGEgRXHepmOGy2o6WWCly427UJCgMJC5c8g=
252-
go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012/go.mod h1:/kVAsGUCyJXIDSgHftCN63QiwAEVHRLX2Kh/S+dqgHY=
253-
go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 h1:R+cfEUMyLn9Q1QknyQ4QU77pbfc1aJKYEXFHtnwSbCg=
254-
go.opentelemetry.io/collector/pdata v1.0.0-rcv0012/go.mod h1:rEAKFqc1L03lidKtra/2/dJtI0Hp+JsQxuPEIkj/2Vg=
255249
go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s=
256250
go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4=
257251
go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo=

‎config/configgrpc/Makefile

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

‎config/configgrpc/go.mod

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
module go.opentelemetry.io/collector/config/configgrpc
2+
3+
go 1.19
4+
5+
require (
6+
github.com/mostynb/go-grpc-compression v1.1.19
7+
github.com/stretchr/testify v1.8.4
8+
go.opentelemetry.io/collector v0.79.0
9+
go.opentelemetry.io/collector/component v0.79.0
10+
go.opentelemetry.io/collector/config/configauth v0.0.0-00010101000000-000000000000
11+
go.opentelemetry.io/collector/config/configcompression v0.0.0-00010101000000-000000000000
12+
go.opentelemetry.io/collector/config/confignet v0.0.0-00010101000000-000000000000
13+
go.opentelemetry.io/collector/config/configopaque v0.0.0-00010101000000-000000000000
14+
go.opentelemetry.io/collector/config/configtls v0.0.0-00010101000000-000000000000
15+
go.opentelemetry.io/collector/config/internal v0.0.0-00010101000000-000000000000
16+
go.opentelemetry.io/collector/extension/auth v0.0.0-20230615165320-df20186ee21c
17+
go.opentelemetry.io/collector/pdata v1.0.0-rcv0012
18+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17
19+
go.opentelemetry.io/otel v1.16.0
20+
go.uber.org/zap v1.24.0
21+
google.golang.org/grpc v1.55.0
22+
)
23+
24+
require (
25+
cloud.google.com/go/compute v1.20.0 // indirect
26+
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
27+
github.com/beorn7/perks v1.0.1 // indirect
28+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
29+
github.com/davecgh/go-spew v1.1.1 // indirect
30+
github.com/fsnotify/fsnotify v1.6.0 // indirect
31+
github.com/go-kit/log v0.2.1 // indirect
32+
github.com/go-logfmt/logfmt v0.5.1 // indirect
33+
github.com/go-logr/logr v1.2.4 // indirect
34+
github.com/go-logr/stdr v1.2.2 // indirect
35+
github.com/gogo/protobuf v1.3.2 // indirect
36+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
37+
github.com/golang/protobuf v1.5.3 // indirect
38+
github.com/golang/snappy v0.0.4 // indirect
39+
github.com/json-iterator/go v1.1.12 // indirect
40+
github.com/klauspost/compress v1.16.6 // indirect
41+
github.com/knadh/koanf v1.5.0 // indirect
42+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
43+
github.com/mitchellh/copystructure v1.2.0 // indirect
44+
github.com/mitchellh/mapstructure v1.5.0 // indirect
45+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
46+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
47+
github.com/modern-go/reflect2 v1.0.2 // indirect
48+
github.com/pmezard/go-difflib v1.0.0 // indirect
49+
github.com/prometheus/client_golang v1.15.1 // indirect
50+
github.com/prometheus/client_model v0.4.0 // indirect
51+
github.com/prometheus/common v0.44.0 // indirect
52+
github.com/prometheus/procfs v0.9.0 // indirect
53+
github.com/prometheus/statsd_exporter v0.22.7 // indirect
54+
go.opencensus.io v0.24.0 // indirect
55+
go.opentelemetry.io/collector/config/configtelemetry v0.0.0-00010101000000-000000000000 // indirect
56+
go.opentelemetry.io/collector/confmap v0.79.0 // indirect
57+
go.opentelemetry.io/collector/consumer v0.79.0 // indirect
58+
go.opentelemetry.io/collector/exporter v0.79.0 // indirect
59+
go.opentelemetry.io/collector/extension v0.0.0-20230609200026-525adf4a682a // indirect
60+
go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect
61+
go.opentelemetry.io/collector/processor v0.0.0-20230609193203-89d1060c7606 // indirect
62+
go.opentelemetry.io/collector/receiver v0.79.0 // indirect
63+
go.opentelemetry.io/otel/exporters/prometheus v0.39.0 // indirect
64+
go.opentelemetry.io/otel/metric v1.16.0 // indirect
65+
go.opentelemetry.io/otel/sdk v1.16.0 // indirect
66+
go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect
67+
go.opentelemetry.io/otel/trace v1.16.0 // indirect
68+
go.uber.org/atomic v1.10.0 // indirect
69+
go.uber.org/multierr v1.11.0 // indirect
70+
golang.org/x/net v0.11.0 // indirect
71+
golang.org/x/sys v0.9.0 // indirect
72+
golang.org/x/text v0.10.0 // indirect
73+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
74+
google.golang.org/protobuf v1.30.0 // indirect
75+
gopkg.in/yaml.v2 v2.4.0 // indirect
76+
gopkg.in/yaml.v3 v3.0.1 // indirect
77+
)
78+
79+
replace go.opentelemetry.io/collector => ../../
80+
81+
replace go.opentelemetry.io/collector/config/configauth => ../configauth
82+
83+
replace go.opentelemetry.io/collector/config/configcompression => ../configcompression
84+
85+
replace go.opentelemetry.io/collector/config/confignet => ../confignet
86+
87+
replace go.opentelemetry.io/collector/config/configopaque => ../configopaque
88+
89+
replace go.opentelemetry.io/collector/config/configtls => ../configtls
90+
91+
replace go.opentelemetry.io/collector/config/configtelemetry => ../configtelemetry
92+
93+
replace go.opentelemetry.io/collector/config/internal => ../internal
94+
95+
replace go.opentelemetry.io/collector/extension => ../../extension
96+
97+
replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth
98+
99+
replace go.opentelemetry.io/collector/confmap => ../../confmap
100+
101+
replace go.opentelemetry.io/collector/processor => ../../processor
102+
103+
replace go.opentelemetry.io/collector/exporter => ../../exporter
104+
105+
replace go.opentelemetry.io/collector/extension/zpagesextension => ../../extension/zpagesextension
106+
107+
replace go.opentelemetry.io/collector/receiver => ../../receiver
108+
109+
replace go.opentelemetry.io/collector/connector => ../../connector
110+
111+
replace go.opentelemetry.io/collector/featuregate => ../../featuregate
112+
113+
replace go.opentelemetry.io/collector/pdata => ../../pdata
114+
115+
replace go.opentelemetry.io/collector/component => ../../component
116+
117+
replace go.opentelemetry.io/collector/semconv => ../../semconv
118+
119+
replace go.opentelemetry.io/collector/consumer => ../../consumer

0 commit comments

Comments
 (0)