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 dependency #14890

Merged
merged 1 commit into from
Oct 11, 2022
Merged

[chore] Update otel core dependency #14890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions cmd/configschema/go.mod
View file
Open in desktop
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.61.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.61.0
github.com/stretchr/testify v1.8.0
go.opentelemetry.io/collector v0.61.1-0.20221006231412-05d1c5f5572d
go.opentelemetry.io/collector v0.61.1-0.20221011194806-6e554f2d823b
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4
golang.org/x/text v0.3.7
)
Expand Down Expand Up @@ -577,8 +577,8 @@ require (
go.mongodb.org/atlas v0.17.0 // indirect
go.mongodb.org/mongo-driver v1.10.3 // indirect
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/collector/pdata v0.61.1-0.20221006231412-05d1c5f5572d // indirect
go.opentelemetry.io/collector/semconv v0.61.1-0.20221006231412-05d1c5f5572d // indirect
go.opentelemetry.io/collector/pdata v0.61.1-0.20221011194806-6e554f2d823b // indirect
go.opentelemetry.io/collector/semconv v0.61.1-0.20221011194806-6e554f2d823b // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 // indirect
go.opentelemetry.io/contrib/zpages v0.36.1 // indirect
Expand Down
12 changes: 6 additions & 6 deletions cmd/configschema/go.sum
View file
Open in desktop

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
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.11.1
github.com/stretchr/testify v1.8.0
go.opentelemetry.io/collector v0.61.1-0.20221006231412-05d1c5f5572d
go.opentelemetry.io/collector/pdata v0.61.1-0.20221006231412-05d1c5f5572d
go.opentelemetry.io/collector v0.61.1-0.20221011194806-6e554f2d823b
go.opentelemetry.io/collector/pdata v0.61.1-0.20221011194806-6e554f2d823b
)

require (
Expand Down
8 changes: 4 additions & 4 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.

3 changes: 2 additions & 1 deletion cmd/mdatagen/loader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"github.com/go-playground/validator/v10"
"github.com/go-playground/validator/v10/non-standard/validators"
en_translations "github.com/go-playground/validator/v10/translations/en"
"go.opentelemetry.io/collector/confmap"
"go.opentelemetry.io/collector/confmap/provider/fileprovider"
"go.opentelemetry.io/collector/pdata/pcommon"
)
Expand Down Expand Up @@ -180,7 +181,7 @@ func loadMetadata(filePath string) (metadata, error) {
}

var md metadata
if err := m.UnmarshalExact(&md); err != nil {
if err := m.Unmarshal(&md, confmap.WithErrorUnused()); err != nil {
return metadata{}, err
}

Expand Down
6 changes: 3 additions & 3 deletions cmd/mdatagen/metricdata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ type Aggregated struct {
func (agg Aggregated) Type() string {
switch agg.Aggregation {
case "delta":
return "pmetric.MetricAggregationTemporalityDelta"
return "pmetric.AggregationTemporalityDelta"
case "cumulative":
return "pmetric.MetricAggregationTemporalityCumulative"
return "pmetric.AggregationTemporalityCumulative"
default:
return "pmetric.MetricAggregationTemporalityUnknown"
return "pmetric.AggregationTemporalityUnknown"
}
}

Expand Down
6 changes: 3 additions & 3 deletions cmd/mdatagen/metricdata_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ func TestMetricData(t *testing.T) {

func TestAggregation(t *testing.T) {
delta := Aggregated{Aggregation: "delta"}
assert.Equal(t, "pmetric.MetricAggregationTemporalityDelta", delta.Type())
assert.Equal(t, "pmetric.AggregationTemporalityDelta", delta.Type())

cumulative := Aggregated{Aggregation: "cumulative"}
assert.Equal(t, "pmetric.MetricAggregationTemporalityCumulative", cumulative.Type())
assert.Equal(t, "pmetric.AggregationTemporalityCumulative", cumulative.Type())

unknown := Aggregated{Aggregation: ""}
assert.Equal(t, "pmetric.MetricAggregationTemporalityUnknown", unknown.Type())
assert.Equal(t, "pmetric.AggregationTemporalityUnknown", unknown.Type())
}
2 changes: 1 addition & 1 deletion confmap/provider/s3provider/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/aws/aws-sdk-go-v2/config v1.17.8
github.com/aws/aws-sdk-go-v2/service/s3 v1.19.0
github.com/stretchr/testify v1.8.0
go.opentelemetry.io/collector v0.61.1-0.20221006231412-05d1c5f5572d
go.opentelemetry.io/collector v0.61.1-0.20221011194806-6e554f2d823b
gopkg.in/yaml.v2 v2.4.0
)

Expand Down
4 changes: 2 additions & 2 deletions confmap/provider/s3provider/go.sum
View file
Open in desktop

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

6 changes: 3 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,9 +7,9 @@ require (
github.com/gogo/protobuf v1.3.2
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.61.0
github.com/stretchr/testify v1.8.0
go.opentelemetry.io/collector v0.61.1-0.20221006231412-05d1c5f5572d
go.opentelemetry.io/collector/pdata v0.61.1-0.20221006231412-05d1c5f5572d
go.opentelemetry.io/collector/semconv v0.61.1-0.20221006231412-05d1c5f5572d
go.opentelemetry.io/collector v0.61.1-0.20221011194806-6e554f2d823b
go.opentelemetry.io/collector/pdata v0.61.1-0.20221011194806-6e554f2d823b
go.opentelemetry.io/collector/semconv v0.61.1-0.20221011194806-6e554f2d823b
go.uber.org/zap v1.23.0
)

Expand Down
12 changes: 6 additions & 6 deletions exporter/alibabacloudlogserviceexporter/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ func doubleSummaryMetricsToLogs(name string, data pmetric.SummaryDataPointSlice,

func metricDataToLogServiceData(md pmetric.Metric, defaultLabels KeyValues) (logs []*sls.Log) {
switch md.Type() {
case pmetric.MetricTypeNone:
case pmetric.MetricTypeEmpty:
break
case pmetric.MetricTypeGauge:
return numberMetricsToLogs(md.Name(), md.Gauge().DataPoints(), defaultLabels)
Expand Down
4 changes: 2 additions & 2 deletions exporter/awscloudwatchlogsexporter/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/internal/aws/awsutil v0.61.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.61.0
github.com/stretchr/testify v1.8.0
go.opentelemetry.io/collector v0.61.1-0.20221006231412-05d1c5f5572d
go.opentelemetry.io/collector/pdata v0.61.1-0.20221006231412-05d1c5f5572d
go.opentelemetry.io/collector v0.61.1-0.20221011194806-6e554f2d823b
go.opentelemetry.io/collector/pdata v0.61.1-0.20221011194806-6e554f2d823b
go.uber.org/zap v1.23.0
)

Expand Down
8 changes: 4 additions & 4 deletions exporter/awscloudwatchlogsexporter/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion exporter/awsemfexporter/datapoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ func getDataPoints(pmd pmetric.Metric, metadata cWMetricMetadata, logger *zap.Lo
}
case pmetric.MetricTypeSum:
metric := pmd.Sum()
adjusterMetadata.adjustToDelta = metric.AggregationTemporality() == pmetric.MetricAggregationTemporalityCumulative
adjusterMetadata.adjustToDelta = metric.AggregationTemporality() == pmetric.AggregationTemporalityCumulative
dps = numberDataPointSlice{
metadata.instrumentationLibraryName,
adjusterMetadata,
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsemfexporter/datapoint_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,7 @@ func TestGetDataPoints(t *testing.T) {
{
Entry: zapcore.Entry{Level: zap.WarnLevel, Message: "Unhandled metric data type."},
Context: []zapcore.Field{
zap.String("DataType", "None"),
zap.String("DataType", "Empty"),
zap.String("Name", "foo"),
zap.String("Unit", "Count"),
},
Expand Down
6 changes: 3 additions & 3 deletions exporter/awsemfexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.61.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.61.0
github.com/stretchr/testify v1.8.0
go.opentelemetry.io/collector v0.61.1-0.20221006231412-05d1c5f5572d
go.opentelemetry.io/collector/pdata v0.61.1-0.20221006231412-05d1c5f5572d
go.opentelemetry.io/collector/semconv v0.61.1-0.20221006231412-05d1c5f5572d
go.opentelemetry.io/collector v0.61.1-0.20221011194806-6e554f2d823b
go.opentelemetry.io/collector/pdata v0.61.1-0.20221011194806-6e554f2d823b
go.opentelemetry.io/collector/semconv v0.61.1-0.20221011194806-6e554f2d823b
go.uber.org/zap v1.23.0
google.golang.org/protobuf v1.28.1
)
Expand Down
12 changes: 6 additions & 6 deletions exporter/awsemfexporter/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion exporter/awsemfexporter/grouped_metric_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ func TestAddToGroupedMetric(t *testing.T) {
{
Entry: zapcore.Entry{Level: zap.WarnLevel, Message: "Unhandled metric data type."},
Context: []zapcore.Field{
zap.String("DataType", "None"),
zap.String("DataType", "Empty"),
zap.String("Name", "foo"),
zap.String("Unit", "Count"),
},
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsemfexporter/metric_translator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const (
)

var fieldPrometheusTypes = map[pmetric.MetricType]string{
pmetric.MetricTypeNone: "",
pmetric.MetricTypeEmpty: "",
pmetric.MetricTypeGauge: "gauge",
pmetric.MetricTypeSum: "counter",
pmetric.MetricTypeHistogram: "histogram",
Expand Down
6 changes: 3 additions & 3 deletions exporter/awskinesisexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.61.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.61.0
github.com/stretchr/testify v1.8.0
go.opentelemetry.io/collector v0.61.1-0.20221006231412-05d1c5f5572d
go.opentelemetry.io/collector/pdata v0.61.1-0.20221006231412-05d1c5f5572d
go.opentelemetry.io/collector v0.61.1-0.20221011194806-6e554f2d823b
go.opentelemetry.io/collector/pdata v0.61.1-0.20221011194806-6e554f2d823b
go.uber.org/multierr v1.8.0
go.uber.org/zap v1.23.0
)
Expand Down Expand Up @@ -50,7 +50,7 @@ require (
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/collector/semconv v0.61.1-0.20221006231412-05d1c5f5572d // indirect
go.opentelemetry.io/collector/semconv v0.61.1-0.20221011194806-6e554f2d823b // indirect
go.opentelemetry.io/otel v1.10.0 // indirect
go.opentelemetry.io/otel/metric v0.32.1 // indirect
go.opentelemetry.io/otel/trace v1.10.0 // indirect
Expand Down
Loading