Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[chore] update otel core #23578

Merged
merged 4 commits into from
Jun 20, 2023
Merged

[chore] update otel core #23578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4cacbfa
[chore] update otel core
Jun 20, 2023
7387a8d
more tidy
Jun 20, 2023
a3d3c28
tidy again
Jun 20, 2023
516ceb3
update tests as the defaults for TLSClientSettings have changed
Jun 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 1 addition & 2 deletions cmd/configschema/comments_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ func TestExternalType(t *testing.T) {
func TestSubPackage(t *testing.T) {
s := configtls.TLSClientSetting{}
v := reflect.ValueOf(s)
comments, err := commentsForStruct(v, testDR())
_, err := commentsForStruct(v, testDR())
require.NoError(t, err)
assert.NotEmpty(t, comments)
}
5 changes: 0 additions & 5 deletions cmd/configschema/fields_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,6 @@ func testReadFields(t *testing.T, s testStruct, defaults map[string]interface{})
Kind: "string",
Default: "",
}, getFieldByName(personPtrs.Fields, "name"))

tls := getFieldByName(root.Fields, "tls")
assert.NotEmpty(t, tls.Doc)
caFile := getFieldByName(tls.Fields, "ca_file")
assert.NotEmpty(t, caFile.Doc)
}

func getFieldByName(fields []*Field, name string) *Field {
Expand Down
69 changes: 40 additions & 29 deletions cmd/configschema/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib v0.79.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.79.0
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/collector v0.79.1-0.20230609201858-ed8547a8e5d6
go.opentelemetry.io/collector/component v0.79.1-0.20230609201858-ed8547a8e5d6
go.opentelemetry.io/collector/receiver/otlpreceiver v0.79.1-0.20230609201858-ed8547a8e5d6
go.opentelemetry.io/collector v0.79.1-0.20230620160303-6059751e64e0
go.opentelemetry.io/collector/component v0.79.1-0.20230620160303-6059751e64e0
go.opentelemetry.io/collector/config/configtls v0.0.0-20230620160303-6059751e64e0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.79.1-0.20230620160303-6059751e64e0
golang.org/x/mod v0.10.0
golang.org/x/text v0.10.0
gopkg.in/yaml.v2 v2.4.0
Expand Down Expand Up @@ -202,15 +203,15 @@ require (
github.com/samber/lo v1.37.0 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230214151822-6a6813cf5bf1 // indirect
go.opentelemetry.io/collector/exporter v0.79.1-0.20230609201858-ed8547a8e5d6 // indirect
go.opentelemetry.io/collector/receiver v0.79.1-0.20230609201858-ed8547a8e5d6 // indirect
go.opentelemetry.io/collector/exporter v0.79.1-0.20230620160303-6059751e64e0 // indirect
go.opentelemetry.io/collector/receiver v0.79.1-0.20230620160303-6059751e64e0 // indirect
)

require (
bitbucket.org/atlassian/go-asap/v2 v2.6.0 // indirect
cloud.google.com/go v0.110.2 // indirect
cloud.google.com/go/compute v1.19.3 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/compute v1.20.0 // indirect
cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect
cloud.google.com/go/iam v1.0.1 // indirect
cloud.google.com/go/logging v1.7.0 // indirect
cloud.google.com/go/longrunning v0.4.1 // indirect
Expand Down Expand Up @@ -322,7 +323,7 @@ require (
github.com/cilium/ebpf v0.8.1 // indirect
github.com/cloudfoundry-incubator/uaago v0.0.0-20190307164349-8136b7bbe76e // indirect
github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe // indirect
github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195 // indirect
github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 // indirect
github.com/containerd/cgroups v1.0.4 // indirect
github.com/containerd/console v1.0.3 // indirect
github.com/containerd/ttrpc v1.1.0 // indirect
Expand All @@ -349,8 +350,8 @@ require (
github.com/elastic/go-elasticsearch/v7 v7.17.10 // indirect
github.com/elastic/go-structform v0.0.10 // indirect
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
github.com/envoyproxy/go-control-plane v0.11.0 // indirect
github.com/envoyproxy/protoc-gen-validate v0.10.0 // indirect
github.com/envoyproxy/go-control-plane v0.11.1-0.20230524094728-9239064ad72f // indirect
github.com/envoyproxy/protoc-gen-validate v0.10.1 // indirect
github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
github.com/facebook/time v0.0.0-20220713225404-f7a0d7702d50 // indirect
github.com/fatih/color v1.14.1 // indirect
Expand Down Expand Up @@ -452,7 +453,7 @@ require (
github.com/julienschmidt/httprouter v1.3.0 // indirect
github.com/karrick/godirwalk v1.17.0 // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/klauspost/compress v1.16.5 // indirect
github.com/klauspost/compress v1.16.6 // indirect
github.com/knadh/koanf v1.5.0 // indirect
github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b // indirect
github.com/kr/fs v0.1.0 // indirect
Expand Down Expand Up @@ -485,7 +486,7 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mongodb-forks/digest v1.0.4 // indirect
github.com/montanaflynn/stats v0.6.6 // indirect
github.com/mostynb/go-grpc-compression v1.1.18 // indirect
github.com/mostynb/go-grpc-compression v1.1.19 // indirect
github.com/mrunalp/fileutils v0.5.0 // indirect
github.com/mtibben/percent v0.2.1 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
Expand Down Expand Up @@ -536,7 +537,7 @@ require (
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
github.com/pquerna/cachecontrol v0.1.0 // indirect
github.com/prometheus/client_golang v1.15.1 // 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/common/sigv4 v0.1.0 // indirect
Expand Down Expand Up @@ -597,21 +598,31 @@ require (
go.mongodb.org/atlas v0.29.0 // indirect
go.mongodb.org/mongo-driver v1.11.7 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector/confmap v0.79.1-0.20230609201858-ed8547a8e5d6 // indirect
go.opentelemetry.io/collector/consumer v0.79.1-0.20230609201858-ed8547a8e5d6 // indirect
go.opentelemetry.io/collector/exporter/loggingexporter v0.79.1-0.20230609201858-ed8547a8e5d6 // indirect
go.opentelemetry.io/collector/exporter/otlpexporter v0.79.1-0.20230609201858-ed8547a8e5d6 // indirect
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.79.1-0.20230609201858-ed8547a8e5d6 // indirect
go.opentelemetry.io/collector/extension v0.0.0-20230609200026-525adf4a682a // indirect
go.opentelemetry.io/collector/extension/ballastextension v0.79.1-0.20230609201858-ed8547a8e5d6 // indirect
go.opentelemetry.io/collector/extension/zpagesextension v0.79.1-0.20230609201858-ed8547a8e5d6 // indirect
go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012.0.20230609201858-ed8547a8e5d6 // indirect
go.opentelemetry.io/collector/pdata v1.0.0-rcv0012.0.20230609201858-ed8547a8e5d6 // indirect
go.opentelemetry.io/collector/processor v0.0.0-20230609193203-89d1060c7606 // indirect
go.opentelemetry.io/collector/processor/batchprocessor v0.79.1-0.20230609201858-ed8547a8e5d6 // indirect
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.79.1-0.20230609201858-ed8547a8e5d6 // indirect
go.opentelemetry.io/collector/semconv v0.79.1-0.20230609201858-ed8547a8e5d6 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
go.opentelemetry.io/collector/config/configauth v0.0.0-20230620160303-6059751e64e0 // indirect
go.opentelemetry.io/collector/config/configcompression v0.0.0-20230620160303-6059751e64e0 // indirect
go.opentelemetry.io/collector/config/configgrpc v0.0.0-20230620160303-6059751e64e0 // indirect
go.opentelemetry.io/collector/config/confighttp v0.0.0-20230620160303-6059751e64e0 // indirect
go.opentelemetry.io/collector/config/confignet v0.0.0-20230620160303-6059751e64e0 // indirect
go.opentelemetry.io/collector/config/configopaque v0.0.0-20230620160303-6059751e64e0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.0.0-20230620160303-6059751e64e0 // indirect
go.opentelemetry.io/collector/config/internal v0.0.0-20230620160303-6059751e64e0 // indirect
go.opentelemetry.io/collector/confmap v0.79.1-0.20230620160303-6059751e64e0 // indirect
go.opentelemetry.io/collector/connector v0.0.0-20230615165320-df20186ee21c // indirect
go.opentelemetry.io/collector/consumer v0.79.1-0.20230620160303-6059751e64e0 // indirect
go.opentelemetry.io/collector/exporter/loggingexporter v0.79.1-0.20230620160303-6059751e64e0 // indirect
go.opentelemetry.io/collector/exporter/otlpexporter v0.79.1-0.20230620160303-6059751e64e0 // indirect
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.79.1-0.20230620160303-6059751e64e0 // indirect
go.opentelemetry.io/collector/extension v0.0.0-20230620160303-6059751e64e0 // indirect
go.opentelemetry.io/collector/extension/auth v0.0.0-20230620163534-beb9545e96a0 // indirect
go.opentelemetry.io/collector/extension/ballastextension v0.79.1-0.20230620160303-6059751e64e0 // indirect
go.opentelemetry.io/collector/extension/zpagesextension v0.79.1-0.20230620160303-6059751e64e0 // indirect
go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012.0.20230619144035-25129b794d48 // indirect
go.opentelemetry.io/collector/pdata v1.0.0-rcv0012.0.20230619144035-25129b794d48 // indirect
go.opentelemetry.io/collector/processor v0.0.0-20230619144035-25129b794d48 // indirect
go.opentelemetry.io/collector/processor/batchprocessor v0.79.1-0.20230620160303-6059751e64e0 // indirect
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.79.1-0.20230620160303-6059751e64e0 // indirect
go.opentelemetry.io/collector/semconv v0.79.1-0.20230620160303-6059751e64e0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.17.0 // indirect
go.opentelemetry.io/contrib/zpages v0.42.0 // indirect
Expand Down Expand Up @@ -642,7 +653,7 @@ require (
google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
google.golang.org/grpc v1.55.0 // indirect
google.golang.org/grpc v1.56.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
Expand Down
Loading