-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
split configgrpc, confighttp, and config/internal (#7921)
These are the last of the config packages. Fixes #7895 I decided to submit these last 3 modules together to reduce review cycles. The use of the `internal` module is a result of the conversation w/ @mx-psi here: #7895 (comment) --------- Signed-off-by: Alex Boten <[email protected]>
- Loading branch information
Alex Boten
authored
Jun 17, 2023
1 parent
4b30d7f
commit e0c09f0
Showing
36 changed files
with
3,572 additions
and
373 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| # One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' | ||
| change_type: enhancement | ||
|
|
||
| # The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) | ||
| component: configgrpc, confighttp, config/internal | ||
|
|
||
| # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). | ||
| note: Split confighttp, configgrpc, and config/internal into separate modules | ||
|
|
||
| # One or more tracking issues or pull requests related to the change | ||
| issues: [7895] | ||
|
|
||
| # (Optional) One or more lines of additional information to render under the primary note. | ||
| # These lines will be padded with 2 spaces and then inserted directly into the document. | ||
| # Use pipe (|) for multiline entries. | ||
| subtext: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| include ../../Makefile.Common |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| module go.opentelemetry.io/collector/config/configgrpc | ||
|
|
||
| go 1.19 | ||
|
|
||
| require ( | ||
| github.com/mostynb/go-grpc-compression v1.1.19 | ||
| github.com/stretchr/testify v1.8.4 | ||
| go.opentelemetry.io/collector v0.79.0 | ||
| go.opentelemetry.io/collector/component v0.79.0 | ||
| go.opentelemetry.io/collector/config/configauth v0.0.0-00010101000000-000000000000 | ||
| go.opentelemetry.io/collector/config/configcompression v0.0.0-00010101000000-000000000000 | ||
| go.opentelemetry.io/collector/config/confignet v0.0.0-00010101000000-000000000000 | ||
| go.opentelemetry.io/collector/config/configopaque v0.0.0-00010101000000-000000000000 | ||
| go.opentelemetry.io/collector/config/configtls v0.0.0-00010101000000-000000000000 | ||
| go.opentelemetry.io/collector/config/internal v0.0.0-00010101000000-000000000000 | ||
| go.opentelemetry.io/collector/extension/auth v0.0.0-20230615165320-df20186ee21c | ||
| go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 | ||
| go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17 | ||
| go.opentelemetry.io/otel v1.16.0 | ||
| go.uber.org/zap v1.24.0 | ||
| google.golang.org/grpc v1.56.0 | ||
| ) | ||
|
|
||
| require ( | ||
| cloud.google.com/go/compute v1.20.0 // indirect | ||
| contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect | ||
| github.com/beorn7/perks v1.0.1 // indirect | ||
| github.com/cespare/xxhash/v2 v2.2.0 // indirect | ||
| github.com/davecgh/go-spew v1.1.1 // indirect | ||
| github.com/fsnotify/fsnotify v1.6.0 // indirect | ||
| github.com/go-kit/log v0.2.1 // indirect | ||
| github.com/go-logfmt/logfmt v0.5.1 // indirect | ||
| github.com/go-logr/logr v1.2.4 // indirect | ||
| github.com/go-logr/stdr v1.2.2 // indirect | ||
| github.com/gogo/protobuf v1.3.2 // indirect | ||
| github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect | ||
| github.com/golang/protobuf v1.5.3 // indirect | ||
| github.com/golang/snappy v0.0.4 // indirect | ||
| github.com/json-iterator/go v1.1.12 // indirect | ||
| github.com/klauspost/compress v1.16.6 // indirect | ||
| github.com/knadh/koanf v1.5.0 // indirect | ||
| github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect | ||
| github.com/mitchellh/copystructure v1.2.0 // indirect | ||
| github.com/mitchellh/mapstructure v1.5.0 // indirect | ||
| github.com/mitchellh/reflectwalk v1.0.2 // indirect | ||
| github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect | ||
| github.com/modern-go/reflect2 v1.0.2 // indirect | ||
| github.com/pmezard/go-difflib v1.0.0 // indirect | ||
| github.com/prometheus/client_golang v1.16.0 // indirect | ||
| github.com/prometheus/client_model v0.4.0 // indirect | ||
| github.com/prometheus/common v0.44.0 // indirect | ||
| github.com/prometheus/procfs v0.10.1 // indirect | ||
| github.com/prometheus/statsd_exporter v0.22.7 // indirect | ||
| go.opencensus.io v0.24.0 // indirect | ||
| go.opentelemetry.io/collector/config/configtelemetry v0.0.0-00010101000000-000000000000 // indirect | ||
| go.opentelemetry.io/collector/confmap v0.79.0 // indirect | ||
| go.opentelemetry.io/collector/consumer v0.79.0 // indirect | ||
| go.opentelemetry.io/collector/exporter v0.79.0 // indirect | ||
| go.opentelemetry.io/collector/extension v0.0.0-20230609200026-525adf4a682a // indirect | ||
| go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect | ||
| go.opentelemetry.io/collector/processor v0.0.0-20230609193203-89d1060c7606 // indirect | ||
| go.opentelemetry.io/collector/receiver v0.79.0 // indirect | ||
| go.opentelemetry.io/otel/exporters/prometheus v0.39.0 // indirect | ||
| go.opentelemetry.io/otel/metric v1.16.0 // indirect | ||
| go.opentelemetry.io/otel/sdk v1.16.0 // indirect | ||
| go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect | ||
| go.opentelemetry.io/otel/trace v1.16.0 // indirect | ||
| go.uber.org/atomic v1.10.0 // indirect | ||
| go.uber.org/multierr v1.11.0 // indirect | ||
| golang.org/x/net v0.11.0 // indirect | ||
| golang.org/x/sys v0.9.0 // indirect | ||
| golang.org/x/text v0.10.0 // indirect | ||
| google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect | ||
| google.golang.org/protobuf v1.30.0 // indirect | ||
| gopkg.in/yaml.v2 v2.4.0 // indirect | ||
| gopkg.in/yaml.v3 v3.0.1 // indirect | ||
| ) | ||
|
|
||
| replace go.opentelemetry.io/collector => ../../ | ||
|
|
||
| replace go.opentelemetry.io/collector/config/configauth => ../configauth | ||
|
|
||
| replace go.opentelemetry.io/collector/config/configcompression => ../configcompression | ||
|
|
||
| replace go.opentelemetry.io/collector/config/confignet => ../confignet | ||
|
|
||
| replace go.opentelemetry.io/collector/config/configopaque => ../configopaque | ||
|
|
||
| replace go.opentelemetry.io/collector/config/configtls => ../configtls | ||
|
|
||
| replace go.opentelemetry.io/collector/config/configtelemetry => ../configtelemetry | ||
|
|
||
| replace go.opentelemetry.io/collector/config/internal => ../internal | ||
|
|
||
| replace go.opentelemetry.io/collector/extension => ../../extension | ||
|
|
||
| replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth | ||
|
|
||
| replace go.opentelemetry.io/collector/confmap => ../../confmap | ||
|
|
||
| replace go.opentelemetry.io/collector/processor => ../../processor | ||
|
|
||
| replace go.opentelemetry.io/collector/exporter => ../../exporter | ||
|
|
||
| replace go.opentelemetry.io/collector/extension/zpagesextension => ../../extension/zpagesextension | ||
|
|
||
| replace go.opentelemetry.io/collector/receiver => ../../receiver | ||
|
|
||
| replace go.opentelemetry.io/collector/connector => ../../connector | ||
|
|
||
| replace go.opentelemetry.io/collector/featuregate => ../../featuregate | ||
|
|
||
| replace go.opentelemetry.io/collector/pdata => ../../pdata | ||
|
|
||
| replace go.opentelemetry.io/collector/component => ../../component | ||
|
|
||
| replace go.opentelemetry.io/collector/semconv => ../../semconv | ||
|
|
||
| replace go.opentelemetry.io/collector/consumer => ../../consumer |
Oops, something went wrong.