Skip to content

Commit

Permalink
Bump to lastest core, fix deprecated API calls (#14466)
Browse files Browse the repository at this point in the history
Signed-off-by: Bogdan Drutu <[email protected]>
  • Loading branch information
bogdandrutu committed Sep 23, 2022
1 parent 1e2a266 commit 6457705
Show file tree
Hide file tree
Showing 645 changed files with 4,629 additions and 4,603 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Stability level for components in this repository follow the [definitions](https

## Gated features

Some features are hidden behind feature gates before they are part of the main code path for the component. Note that the feature gates themselves might be at different [lifecycle stages](https://github.com/open-telemetry/opentelemetry-collector/blob/v0.49.0/service/featuregate/README.md#feature-lifecycle).
Some features are hidden behind feature gates before they are part of the main code path for the component. Note that the feature gates themselves might be at different [lifecycle stages](https://github.com/open-telemetry/opentelemetry-collector/tree/main/featuregate#feature-lifecycle).

## Support

Expand Down
12 changes: 6 additions & 6 deletions cmd/configschema/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib v0.60.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.60.0
github.com/stretchr/testify v1.8.0
go.opentelemetry.io/collector v0.60.1-0.20220916163348-84621e483dfb
go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4
golang.org/x/text v0.3.7
)
Expand Down Expand Up @@ -255,7 +255,7 @@ require (
github.com/karrick/godirwalk v1.17.0 // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d // indirect
github.com/klauspost/compress v1.15.9 // indirect
github.com/klauspost/compress v1.15.10 // indirect
github.com/knadh/koanf v1.4.3 // indirect
github.com/kolo/xmlrpc v0.0.0-20201022064351-38db28db192b // indirect
github.com/leoluk/perflib_exporter v0.1.0 // indirect
Expand Down Expand Up @@ -563,13 +563,13 @@ require (
go.mongodb.org/atlas v0.16.0 // indirect
go.mongodb.org/mongo-driver v1.10.2 // indirect
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/collector/pdata v0.60.1-0.20220916163348-84621e483dfb // indirect
go.opentelemetry.io/collector/semconv v0.60.1-0.20220916163348-84621e483dfb // indirect
go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect
go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.0 // indirect
go.opentelemetry.io/contrib/zpages v0.34.0 // indirect
go.opentelemetry.io/contrib/zpages v0.36.0 // indirect
go.opentelemetry.io/otel v1.10.0 // indirect
go.opentelemetry.io/otel/metric v0.32.0 // indirect
go.opentelemetry.io/otel/metric v0.32.1 // indirect
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
go.opentelemetry.io/otel/trace v1.10.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
Expand Down
35 changes: 18 additions & 17 deletions cmd/configschema/go.sum

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

4 changes: 2 additions & 2 deletions cmd/mdatagen/go.mod
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.11.1
github.com/stretchr/testify v1.8.0
go.opentelemetry.io/collector v0.60.1-0.20220916163348-84621e483dfb
go.opentelemetry.io/collector/pdata v0.60.1-0.20220916163348-84621e483dfb
go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002
go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002
)

require (
Expand Down
8 changes: 4 additions & 4 deletions cmd/mdatagen/go.sum

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.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ func (m *metric{{ $name.Render }}) recordDataPoint(start pcommon.Timestamp, ts p
dp := m.data.{{ $metric.Data.Type }}().DataPoints().AppendEmpty()
dp.SetStartTimestamp(start)
dp.SetTimestamp(ts)
dp.Set{{ $metric.Data.MetricValueType }}Val(val)
dp.Set{{ $metric.Data.MetricValueType }}Value(val)
{{- range $metric.Attributes }}
{{- if eq (attributeInfo .).Type.Primitive "bool" }}
dp.Attributes().PutBool("{{ attributeKey .}}", {{ .RenderUnexported }}AttributeValue)
Expand Down Expand Up @@ -214,10 +214,10 @@ func WithStartTimeOverride(start pcommon.Timestamp) ResourceMetricsOption {
var dps pmetric.NumberDataPointSlice
metrics := rm.ScopeMetrics().At(0).Metrics()
for i := 0; i < metrics.Len(); i++ {
switch metrics.At(i).DataType() {
case pmetric.MetricDataTypeGauge:
switch metrics.At(i).Type() {
case pmetric.MetricTypeGauge:
dps = metrics.At(i).Gauge().DataPoints()
case pmetric.MetricDataTypeSum:
case pmetric.MetricTypeSum:
dps = metrics.At(i).Sum().DataPoints()
}
for j := 0; j < dps.Len(); j++ {
Expand Down
8 changes: 4 additions & 4 deletions exporter/alibabacloudlogserviceexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ require (
github.com/gogo/protobuf v1.3.2
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.60.0
github.com/stretchr/testify v1.8.0
go.opentelemetry.io/collector v0.60.1-0.20220916163348-84621e483dfb
go.opentelemetry.io/collector/pdata v0.60.1-0.20220916163348-84621e483dfb
go.opentelemetry.io/collector/semconv v0.60.1-0.20220916163348-84621e483dfb
go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002
go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002
go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002
go.uber.org/zap v1.23.0
)

Expand All @@ -32,7 +32,7 @@ require (
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/otel v1.10.0 // indirect
go.opentelemetry.io/otel/metric v0.32.0 // indirect
go.opentelemetry.io/otel/metric v0.32.1 // indirect
go.opentelemetry.io/otel/trace v1.10.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
Expand Down
18 changes: 9 additions & 9 deletions exporter/alibabacloudlogserviceexporter/go.sum

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

Original file line number Diff line number Diff line change
Expand Up @@ -180,15 +180,15 @@ func numberMetricsToLogs(name string, data pmetric.NumberDataPointSlice, default
newMetricLogFromRaw(name,
labels,
int64(dataPoint.Timestamp()),
float64(dataPoint.IntVal()),
float64(dataPoint.IntValue()),
),
)
case pmetric.NumberDataPointValueTypeDouble:
logs = append(logs,
newMetricLogFromRaw(name,
labels,
int64(dataPoint.Timestamp()),
dataPoint.DoubleVal(),
dataPoint.DoubleValue(),
),
)
}
Expand Down Expand Up @@ -281,16 +281,16 @@ func doubleSummaryMetricsToLogs(name string, data pmetric.SummaryDataPointSlice,
}

func metricDataToLogServiceData(md pmetric.Metric, defaultLabels KeyValues) (logs []*sls.Log) {
switch md.DataType() {
case pmetric.MetricDataTypeNone:
switch md.Type() {
case pmetric.MetricTypeNone:
break
case pmetric.MetricDataTypeGauge:
case pmetric.MetricTypeGauge:
return numberMetricsToLogs(md.Name(), md.Gauge().DataPoints(), defaultLabels)
case pmetric.MetricDataTypeSum:
case pmetric.MetricTypeSum:
return numberMetricsToLogs(md.Name(), md.Sum().DataPoints(), defaultLabels)
case pmetric.MetricDataTypeHistogram:
case pmetric.MetricTypeHistogram:
return doubleHistogramMetricsToLogs(md.Name(), md.Histogram().DataPoints(), defaultLabels)
case pmetric.MetricDataTypeSummary:
case pmetric.MetricTypeSummary:
return doubleSummaryMetricsToLogs(md.Name(), md.Summary().DataPoints(), defaultLabels)
}
return logs
Expand Down
Loading

0 comments on commit 6457705

Please sign in to comment.