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

update otel-core #8858

Merged
merged 6 commits into from
Mar 30, 2022
Merged

update otel-core #8858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6283462
update references to deprecated methods
Mar 28, 2022
828fde9
fix test data
Mar 28, 2022
f3f45a5
update otel-go call
Mar 29, 2022
cd87494
make update-otel
Mar 29, 2022
dec26f6
update test data
Mar 29, 2022
18742ae
update core
Mar 30, 2022
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
  •  
  •  
  •  
9 changes: 4 additions & 5 deletions cmd/configschema/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.47.0
github.com/stretchr/testify v1.7.1
go.opentelemetry.io/collector v0.47.1-0.20220323200141-1b7618728835
go.opentelemetry.io/collector/model v0.47.1-0.20220323200141-1b7618728835
go.opentelemetry.io/collector v0.47.1-0.20220330050215-0f07b0bd64d1
go.opentelemetry.io/collector/model v0.47.1-0.20220330050215-0f07b0bd64d1
go.uber.org/multierr v1.8.0
golang.org/x/mod v0.5.1
)
Expand Down Expand Up @@ -437,10 +437,9 @@ require (
go.mongodb.org/atlas v0.15.0 // indirect
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.31.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.31.0 // indirect
go.opentelemetry.io/otel v1.6.1 // indirect
go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect
go.opentelemetry.io/otel/metric v0.27.0 // indirect
go.opentelemetry.io/otel/metric v0.28.0 // indirect
go.opentelemetry.io/otel/sdk v1.6.1 // indirect
go.opentelemetry.io/otel/trace v1.6.1 // indirect
go.uber.org/atomic v1.9.0 // indirect
Expand Down
190 changes: 19 additions & 171 deletions cmd/configschema/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions cmd/mdatagen/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ require (
github.com/go-playground/universal-translator v0.18.0
github.com/go-playground/validator/v10 v10.10.1
github.com/stretchr/testify v1.7.1
go.opentelemetry.io/collector v0.47.1-0.20220323200141-1b7618728835
go.opentelemetry.io/collector/model v0.47.1-0.20220323200141-1b7618728835
go.opentelemetry.io/collector v0.47.1-0.20220330050215-0f07b0bd64d1
go.opentelemetry.io/collector/model v0.47.1-0.20220330050215-0f07b0bd64d1
)

require (
Expand Down
10 changes: 5 additions & 5 deletions cmd/mdatagen/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions cmd/mdatagen/metrics_v2.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ func NewMetricsBuilder(settings MetricsSettings, options ...metricBuilderOption)

// updateCapacity updates max length of metrics and resource attributes that will be used for the slice capacity.
func (mb *MetricsBuilder) updateCapacity(rm pdata.ResourceMetrics) {
if mb.metricsCapacity < rm.InstrumentationLibraryMetrics().At(0).Metrics().Len() {
mb.metricsCapacity = rm.InstrumentationLibraryMetrics().At(0).Metrics().Len()
if mb.metricsCapacity < rm.ScopeMetrics().At(0).Metrics().Len() {
mb.metricsCapacity = rm.ScopeMetrics().At(0).Metrics().Len()
}
if mb.resourceCapacity < rm.Resource().Attributes().Len() {
mb.resourceCapacity = rm.Resource().Attributes().Len()
Expand Down Expand Up @@ -166,8 +166,8 @@ func (mb *MetricsBuilder) EmitForResource(ro ...ResourceOption) {
for _, op := range ro {
op(rm.Resource())
}
ils := rm.InstrumentationLibraryMetrics().AppendEmpty()
ils.InstrumentationLibrary().SetName("otelcol/{{ .Name }}")
ils := rm.ScopeMetrics().AppendEmpty()
ils.Scope().SetName("otelcol/{{ .Name }}")
ils.Metrics().EnsureCapacity(mb.metricsCapacity)
{{- range $name, $metric := .Metrics }}
mb.metric{{- $name.Render }}.emit(ils.Metrics())
Expand Down
10 changes: 7 additions & 3 deletions exporter/alibabacloudlogserviceexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ require (
github.com/gogo/protobuf v1.3.2
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.47.0
github.com/stretchr/testify v1.7.1
go.opentelemetry.io/collector v0.47.1-0.20220323200141-1b7618728835
go.opentelemetry.io/collector/model v0.47.1-0.20220323200141-1b7618728835
go.opentelemetry.io/collector v0.47.1-0.20220330050215-0f07b0bd64d1
go.opentelemetry.io/collector/model v0.47.1-0.20220330050215-0f07b0bd64d1
go.uber.org/zap v1.21.0
)

Expand All @@ -30,11 +30,15 @@ require (
github.com/spf13/cast v1.4.1 // indirect
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/otel v1.6.1 // indirect
go.opentelemetry.io/otel/metric v0.27.0 // indirect
go.opentelemetry.io/otel/metric v0.28.0 // indirect
go.opentelemetry.io/otel/trace v1.6.1 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
google.golang.org/grpc v1.45.0 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
Loading