Skip to content

Rename pdata.AggregationTemporality* to pdata.MetricAggregationTemporality* #5457

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

Merged
bogdandrutu merged 7 commits into from
Sep 28, 2021
Merged

Rename pdata.AggregationTemporality* to pdata.MetricAggregationTemporality* #5457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
745d8c3
rename AggregationTemporality -> MetricAggregationTemporality
Sep 27, 2021
74e6eea
make update-otel
Sep 27, 2021
9339432
update changelog
Sep 27, 2021
a1234c9
update configtls.TLSClientSetting to *configtls.TLSClientSetting
Sep 27, 2021
003d047
update DefaultBuildInfo to NewDefaultBuildInfo
Sep 27, 2021
80b3ef3
update influxdb libraries
Sep 27, 2021
8f93f93
hack to work around tools caching
Sep 27, 2021
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
  •  
  •  
  •  
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
- Rename `k8s_tagger` configuration `k8sattributes`.
- filelog receiver: use empty value for `SeverityText` field instead of `"Undefined"` (#5423)
- Rename `configparser.ConfigMap` to `config.Map`
- Rename `pdata.AggregationTemporality*` to `pdata.MetricAggregationTemporality*`

## v0.36.0

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 @@ -78,11 +78,11 @@ type Aggregated struct {
func (agg Aggregated) Type() string {
switch agg.Aggregation {
case "delta":
return "pdata.AggregationTemporalityDelta"
return "pdata.MetricAggregationTemporalityDelta"
case "cumulative":
return "pdata.AggregationTemporalityCumulative"
return "pdata.MetricAggregationTemporalityCumulative"
default:
return "pdata.AggregationTemporalityUnknown"
return "pdata.MetricAggregationTemporalityUnknown"
}
}

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 @@ -39,11 +39,11 @@ func TestMetricData(t *testing.T) {

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

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

unknown := Aggregated{Aggregation: ""}
assert.Equal(t, "pdata.AggregationTemporalityUnknown", unknown.Type())
assert.Equal(t, "pdata.MetricAggregationTemporalityUnknown", unknown.Type())
}
4 changes: 2 additions & 2 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.36.0
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1
go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1
go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e
go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e
go.uber.org/zap v1.19.1
)

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

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 @@ -5,8 +5,8 @@ go 1.17
require (
github.com/aws/aws-sdk-go v1.40.47
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1
go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1
go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e
go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e
go.uber.org/zap v1.19.1
)

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 @@ -238,7 +238,7 @@ func getDataPoints(pmd *pdata.Metric, metadata cWMetricMetadata, logger *zap.Log
}
case pdata.MetricDataTypeSum:
metric := pmd.Sum()
adjusterMetadata.adjustToDelta = metric.AggregationTemporality() == pdata.AggregationTemporalityCumulative
adjusterMetadata.adjustToDelta = metric.AggregationTemporality() == pdata.MetricAggregationTemporalityCumulative
dps = numberDataPointSlice{
metadata.instrumentationLibraryName,
adjusterMetadata,
Expand Down
4 changes: 2 additions & 2 deletions exporter/awsemfexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.36.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.36.0
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1
go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1
go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e
go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e
go.uber.org/zap v1.19.1
google.golang.org/protobuf v1.27.1
)
Expand Down
8 changes: 4 additions & 4 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.

4 changes: 2 additions & 2 deletions exporter/awskinesisexporter/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/golang/protobuf v1.5.2
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.36.0
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1
go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1
go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e
go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e
go.uber.org/zap v1.19.1
google.golang.org/protobuf v1.27.1
)
Expand Down
8 changes: 4 additions & 4 deletions exporter/awskinesisexporter/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 exporter/awsprometheusremotewriteexporter/auth_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func TestRequestSignature(t *testing.T) {

setting := confighttp.HTTPClientSettings{
Endpoint: serverURL.String(),
TLSSetting: configtls.TLSClientSetting{},
TLSSetting: &configtls.TLSClientSetting{},
ReadBufferSize: 0,
WriteBufferSize: 0,
Timeout: 0,
Expand Down Expand Up @@ -102,7 +102,7 @@ func TestLeakingBody(t *testing.T) {

setting := confighttp.HTTPClientSettings{
Endpoint: serverURL.String(),
TLSSetting: configtls.TLSClientSetting{},
TLSSetting: &configtls.TLSClientSetting{},
ReadBufferSize: 0,
WriteBufferSize: 0,
Timeout: 0,
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsprometheusremotewriteexporter/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func TestLoadConfig(t *testing.T) {
ExternalLabels: map[string]string{"key1": "value1", "key2": "value2"},
HTTPClientSettings: confighttp.HTTPClientSettings{
Endpoint: "https://aps-workspaces.us-east-1.amazonaws.com/workspaces/ws-XXX/api/v1/remote_write",
TLSSetting: configtls.TLSClientSetting{
TLSSetting: &configtls.TLSClientSetting{
TLSSetting: configtls.TLSSetting{
CAFile: "/var/lib/mycert.pem",
},
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsprometheusremotewriteexporter/factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func TestCreateMetricsExporter(t *testing.T) {
invalidConfig.HTTPClientSettings = confighttp.HTTPClientSettings{}

invalidTLSConfig := af.CreateDefaultConfig().(*Config)
invalidTLSConfig.HTTPClientSettings.TLSSetting = configtls.TLSClientSetting{
invalidTLSConfig.HTTPClientSettings.TLSSetting = &configtls.TLSClientSetting{
TLSSetting: configtls.TLSSetting{
CAFile: "non-existent file",
CertFile: "",
Expand Down
4 changes: 2 additions & 2 deletions exporter/awsprometheusremotewriteexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/aws/aws-sdk-go v1.40.47
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.36.0
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1
go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e
)

require (
Expand Down Expand Up @@ -34,7 +34,7 @@ require (
github.com/tidwall/tinylru v1.0.2 // indirect
github.com/tidwall/wal v0.1.5 // indirect
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 // indirect
go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 // indirect
go.opentelemetry.io/otel v1.0.0 // indirect
go.opentelemetry.io/otel/internal/metric v0.23.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions exporter/awsprometheusremotewriteexporter/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 exporter/awsxrayexporter/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/xray v0.36.0
github.com/stretchr/objx v0.2.0 // indirect
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1
go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1
go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e
go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e
go.uber.org/zap v1.19.1

)
Expand Down
8 changes: 4 additions & 4 deletions exporter/awsxrayexporter/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 exporter/azuremonitorexporter/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/microsoft/ApplicationInsights-Go v0.4.4
github.com/stretchr/objx v0.2.0 // indirect
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1
go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1
go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e
go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e
go.uber.org/zap v1.19.1
golang.org/x/net v0.0.0-20210614182718-04defd469f4e

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

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

Loading