Skip to content

Commit ca0c241

Browse files
author
Alex Boten
committed
Split config/configauth into its own module
Linked issue: open-telemetry#7895 Signed-off-by: Alex Boten <[email protected]>
1 parent d720e8e commit ca0c241

File tree

27 files changed

+565
-28
lines changed

27 files changed

+565
-28
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: configauth
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/configauth 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:

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ check-contrib:
274274
@echo Setting contrib at $(CONTRIB_PATH) to use this core checkout
275275
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector=$(CURDIR)"
276276
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/component=$(CURDIR)/component"
277+
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/config/configauth=$(CURDIR)/config/configauth"
277278
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/config/configcompression=$(CURDIR)/config/configcompression"
278279
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/config/confignet=$(CURDIR)/config/confignet"
279280
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/config/configopaque=$(CURDIR)/config/configopaque"

cmd/builder/test/core.builder.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ exporters:
2020
replaces:
2121
- go.opentelemetry.io/collector => ${WORKSPACE_DIR}
2222
- go.opentelemetry.io/collector/component => ${WORKSPACE_DIR}/component
23-
# - go.opentelemetry.io/collector/config/configauth => ${WORKSPACE_DIR}/config/configauth
23+
- go.opentelemetry.io/collector/config/configauth => ${WORKSPACE_DIR}/config/configauth
2424
- go.opentelemetry.io/collector/config/configcompression => ${WORKSPACE_DIR}/config/configcompression
2525
# - go.opentelemetry.io/collector/config/configgrpc => ${WORKSPACE_DIR}/config/configgrpc
2626
# - go.opentelemetry.io/collector/config/confighttp => ${WORKSPACE_DIR}/config/confighttp

cmd/otelcorecol/builder-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ connectors:
2323
replaces:
2424
- go.opentelemetry.io/collector => ../../
2525
- go.opentelemetry.io/collector/component => ../../component
26-
# - go.opentelemetry.io/collector/config/configauth => ../../config/configauth
26+
- go.opentelemetry.io/collector/config/configauth => ../../config/configauth
2727
- go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression
2828
# - go.opentelemetry.io/collector/config/configgrpc => ../../config/configgrpc
2929
# - go.opentelemetry.io/collector/config/confighttp => ../../config/confighttp

cmd/otelcorecol/go.mod

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ require (
7171
github.com/tklauser/numcpus v0.6.0 // indirect
7272
github.com/yusufpapurcu/wmi v1.2.3 // indirect
7373
go.opencensus.io v0.24.0 // indirect
74+
go.opentelemetry.io/collector/config/configauth v0.0.0-00010101000000-000000000000 // indirect
7475
go.opentelemetry.io/collector/config/configcompression v0.0.0-00010101000000-000000000000 // indirect
7576
go.opentelemetry.io/collector/config/confignet v0.0.0-00010101000000-000000000000 // indirect
7677
go.opentelemetry.io/collector/config/configopaque v0.0.0-00010101000000-000000000000 // indirect
@@ -110,6 +111,8 @@ replace go.opentelemetry.io/collector => ../../
110111

111112
replace go.opentelemetry.io/collector/component => ../../component
112113

114+
replace go.opentelemetry.io/collector/config/configauth => ../../config/configauth
115+
113116
replace go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression
114117

115118
replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet

component/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ require (
3535
gopkg.in/yaml.v3 v3.0.1 // indirect
3636
)
3737

38+
39+
3840
replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry
3941

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

config/configauth/Makefile

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

config/configauth/go.mod

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
module go.opentelemetry.io/collector/config/configauth
2+
3+
go 1.19
4+
5+
6+
7+
replace go.opentelemetry.io/collector/component => ../../component
8+
9+
replace go.opentelemetry.io/collector/config/configtelemetry => ../configtelemetry
10+
11+
replace go.opentelemetry.io/collector/extension => ../../extension
12+
13+
replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth
14+
15+
require (
16+
github.com/stretchr/testify v1.8.4
17+
go.opentelemetry.io/collector/component v0.79.0
18+
go.opentelemetry.io/collector/extension v0.0.0-20230609200026-525adf4a682a
19+
go.opentelemetry.io/collector/extension/auth v0.0.0-20230615165320-df20186ee21c
20+
)
21+
22+
require (
23+
github.com/davecgh/go-spew v1.1.1 // indirect
24+
github.com/gogo/protobuf v1.3.2 // indirect
25+
github.com/golang/protobuf v1.5.3 // indirect
26+
github.com/knadh/koanf v1.5.0 // indirect
27+
github.com/mitchellh/copystructure v1.2.0 // indirect
28+
github.com/mitchellh/mapstructure v1.5.0 // indirect
29+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
30+
github.com/pmezard/go-difflib v1.0.0 // indirect
31+
go.opentelemetry.io/collector/config/configtelemetry v0.0.0-00010101000000-000000000000 // indirect
32+
go.opentelemetry.io/collector/confmap v0.79.0 // indirect
33+
go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect
34+
go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 // indirect
35+
go.opentelemetry.io/otel v1.16.0 // indirect
36+
go.opentelemetry.io/otel/metric v1.16.0 // indirect
37+
go.opentelemetry.io/otel/trace v1.16.0 // indirect
38+
go.uber.org/atomic v1.10.0 // indirect
39+
go.uber.org/multierr v1.11.0 // indirect
40+
go.uber.org/zap v1.24.0 // indirect
41+
golang.org/x/net v0.11.0 // indirect
42+
golang.org/x/sys v0.9.0 // indirect
43+
golang.org/x/text v0.10.0 // indirect
44+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
45+
google.golang.org/grpc v1.55.0 // indirect
46+
google.golang.org/protobuf v1.30.0 // indirect
47+
gopkg.in/yaml.v3 v3.0.1 // indirect
48+
)
49+
50+
replace go.opentelemetry.io/collector/pdata => ../../pdata
51+
52+
replace go.opentelemetry.io/collector/featuregate => ../../featuregate
53+
54+
replace go.opentelemetry.io/collector/confmap => ../../confmap

0 commit comments

Comments
 (0)