Rename pdata.AggregationTemporality* to `pdata.MetricAggregationTem…

…porality*` (#5457) * rename AggregationTemporality -> MetricAggregationTemporality * make update-otel * update changelog * update configtls.TLSClientSetting to *configtls.TLSClientSetting * update DefaultBuildInfo to NewDefaultBuildInfo * update influxdb libraries * hack to work around tools caching
dmitryax · Sep 28, 2021 · b4b57ef · b4b57ef
1 parent fbb2ecd
commit b4b57ef
Show file tree

Hide file tree

Showing 323 changed files with 955 additions and 954 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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
 

diff --git a/cmd/mdatagen/metricdata.go b/cmd/mdatagen/metricdata.go
@@ -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"
 	}
 }
 

diff --git a/cmd/mdatagen/metricdata_test.go b/cmd/mdatagen/metricdata_test.go
@@ -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())
 }
diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod
@@ -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
 )
 

diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum
diff --git a/exporter/awscloudwatchlogsexporter/go.mod b/exporter/awscloudwatchlogsexporter/go.mod
@@ -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
 )
 

diff --git a/exporter/awscloudwatchlogsexporter/go.sum b/exporter/awscloudwatchlogsexporter/go.sum
diff --git a/exporter/awsemfexporter/datapoint.go b/exporter/awsemfexporter/datapoint.go
@@ -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,

diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod
@@ -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
 )

diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum
diff --git a/exporter/awskinesisexporter/go.mod b/exporter/awskinesisexporter/go.mod
@@ -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
 )

diff --git a/exporter/awskinesisexporter/go.sum b/exporter/awskinesisexporter/go.sum
diff --git a/exporter/awsprometheusremotewriteexporter/auth_test.go b/exporter/awsprometheusremotewriteexporter/auth_test.go
@@ -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,
@@ -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,

diff --git a/exporter/awsprometheusremotewriteexporter/config_test.go b/exporter/awsprometheusremotewriteexporter/config_test.go
@@ -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",
 					},

diff --git a/exporter/awsprometheusremotewriteexporter/factory_test.go b/exporter/awsprometheusremotewriteexporter/factory_test.go
@@ -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: "",

diff --git a/exporter/awsprometheusremotewriteexporter/go.mod b/exporter/awsprometheusremotewriteexporter/go.mod
@@ -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 (
@@ -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

diff --git a/exporter/awsprometheusremotewriteexporter/go.sum b/exporter/awsprometheusremotewriteexporter/go.sum
diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod
@@ -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
 
 )

diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum
diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod
@@ -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
 

diff --git a/exporter/azuremonitorexporter/go.sum b/exporter/azuremonitorexporter/go.sum