Skip to content

Commit cc8a58b

Browse files
ymotongpooymotongpoo
authored
Update dependent OpenTelemetry Collector lib version to 0.18.0 (open-telemetry#39)
1 parent 52242bc commit cc8a58b

8 files changed

+93
-280
lines changed

‎go.mod

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@ go 1.14
44

55
require (
66
github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705 // indirect
7-
github.com/go-ole/go-ole v1.2.4 // indirect
87
github.com/mitchellh/go-testing-interface v1.0.3 // indirect
9-
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/stackdriverexporter v0.15.1-0.20201119200044-5843cc66428d
10-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.15.1-0.20201119200044-5843cc66428d
11-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.15.1-0.20201119200044-5843cc66428d
12-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver v0.15.1-0.20201119200044-5843cc66428d
13-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.15.1-0.20201119200044-5843cc66428d
14-
github.com/shirou/gopsutil v3.20.10+incompatible
8+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/stackdriverexporter v0.18.0
9+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.18.0
10+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.18.0
11+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver v0.18.0
12+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.18.0
13+
github.com/shirou/gopsutil v3.20.12-0.20201210134652-afe0c04c5d5a+incompatible
1514
github.com/stretchr/testify v1.6.1
16-
go.opentelemetry.io/collector v0.15.0
15+
go.opentelemetry.io/collector v0.18.0
1716
go.uber.org/zap v1.16.0
18-
golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211
17+
golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e
1918
)

‎go.sum

Lines changed: 74 additions & 236 deletions
Large diffs are not rendered by default.

‎processor/agentmetricsprocessor/agentmetricsprocessor.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ func newMetric(metric pdata.Metric) pdata.Metric {
9494
// and overrides the name with the supplied value
9595
func newMetricWithName(metric pdata.Metric, name string) pdata.Metric {
9696
new := pdata.NewMetric()
97-
new.InitEmpty()
9897

9998
if name != "" {
10099
new.SetName(name)
@@ -109,18 +108,16 @@ func newMetricWithName(metric pdata.Metric, name string) pdata.Metric {
109108
switch t := metric.DataType(); t {
110109
case pdata.MetricDataTypeIntSum:
111110
sum := new.IntSum()
112-
sum.InitEmpty()
113111
sum.SetIsMonotonic(metric.IntSum().IsMonotonic())
114112
sum.SetAggregationTemporality(metric.IntSum().AggregationTemporality())
115113
case pdata.MetricDataTypeDoubleSum:
116114
sum := new.DoubleSum()
117-
sum.InitEmpty()
118115
sum.SetIsMonotonic(metric.DoubleSum().IsMonotonic())
119116
sum.SetAggregationTemporality(metric.DoubleSum().AggregationTemporality())
120117
case pdata.MetricDataTypeIntGauge:
121-
new.IntGauge().InitEmpty()
118+
new.IntGauge()
122119
case pdata.MetricDataTypeDoubleGauge:
123-
new.DoubleGauge().InitEmpty()
120+
new.DoubleGauge()
124121
}
125122

126123
return new

‎processor/agentmetricsprocessor/agentmetricsprocessor_test.go

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"github.com/stretchr/testify/require"
2424
"go.opentelemetry.io/collector/component"
2525
"go.opentelemetry.io/collector/component/componenttest"
26+
"go.opentelemetry.io/collector/consumer/consumertest"
2627
"go.opentelemetry.io/collector/consumer/pdata"
27-
"go.opentelemetry.io/collector/exporter/exportertest"
2828
"go.uber.org/zap"
2929
)
3030

@@ -65,7 +65,7 @@ func TestAgentMetricsProcessor(t *testing.T) {
6565
for _, tt := range tests {
6666
t.Run(tt.name, func(t *testing.T) {
6767
factory := NewFactory()
68-
tmn := &exportertest.SinkMetricsExporter{}
68+
tmn := &consumertest.MetricsSink{}
6969
rmp, err := factory.CreateMetricsProcessor(context.Background(), component.ProcessorCreateParams{Logger: zap.NewNop()}, &Config{}, tmn)
7070
require.NoError(t, err)
7171

@@ -96,15 +96,13 @@ func newResourceMetricsBuilder() resourceMetricsBuilder {
9696

9797
func (rmsb resourceMetricsBuilder) addResourceMetrics(resourceAttributes map[string]pdata.AttributeValue) metricsBuilder {
9898
rm := pdata.NewResourceMetrics()
99-
rm.InitEmpty()
10099

101100
if resourceAttributes != nil {
102101
rm.Resource().Attributes().InitFromMap(resourceAttributes)
103102
}
104103

105104
rm.InstrumentationLibraryMetrics().Resize(1)
106105
ilm := rm.InstrumentationLibraryMetrics().At(0)
107-
ilm.InitEmpty()
108106

109107
rmsb.rms.Append(rm)
110108
return metricsBuilder{metrics: ilm.Metrics()}
@@ -120,25 +118,22 @@ type metricsBuilder struct {
120118

121119
func (msb metricsBuilder) addMetric(name string, t pdata.MetricDataType, isMonotonic bool) metricBuilder {
122120
metric := pdata.NewMetric()
123-
metric.InitEmpty()
124121
metric.SetName(name)
125122
metric.SetDataType(t)
126123

127124
switch t {
128125
case pdata.MetricDataTypeIntSum:
129126
sum := metric.IntSum()
130-
sum.InitEmpty()
131127
sum.SetIsMonotonic(isMonotonic)
132128
sum.SetAggregationTemporality(pdata.AggregationTemporalityCumulative)
133129
case pdata.MetricDataTypeDoubleSum:
134130
sum := metric.DoubleSum()
135-
sum.InitEmpty()
136131
sum.SetIsMonotonic(isMonotonic)
137132
sum.SetAggregationTemporality(pdata.AggregationTemporalityCumulative)
138133
case pdata.MetricDataTypeIntGauge:
139-
metric.IntGauge().InitEmpty()
134+
metric.IntGauge()
140135
case pdata.MetricDataTypeDoubleGauge:
141-
metric.DoubleGauge().InitEmpty()
136+
metric.DoubleGauge()
142137
}
143138

144139
msb.metrics.Append(metric)
@@ -151,7 +146,6 @@ type metricBuilder struct {
151146

152147
func (mb metricBuilder) addIntDataPoint(value int64, labels map[string]string) metricBuilder {
153148
idp := pdata.NewIntDataPoint()
154-
idp.InitEmpty()
155149
idp.LabelsMap().InitFromMap(labels)
156150
idp.SetValue(value)
157151

@@ -167,7 +161,6 @@ func (mb metricBuilder) addIntDataPoint(value int64, labels map[string]string) m
167161

168162
func (mb metricBuilder) addDoubleDataPoint(value float64, labels map[string]string) metricBuilder {
169163
ddp := pdata.NewDoubleDataPoint()
170-
ddp.InitEmpty()
171164
ddp.LabelsMap().InitFromMap(labels)
172165
ddp.SetValue(value)
173166

@@ -202,10 +195,6 @@ func assertEqual(t *testing.T, expected, actual pdata.Metrics) {
202195
ilmAct := ilmsAct.At(j)
203196
ilmExp := ilmsExp.At(j)
204197

205-
// currently expect IL to always be nil
206-
assert.True(t, ilmAct.InstrumentationLibrary().IsNil())
207-
assert.True(t, ilmExp.InstrumentationLibrary().IsNil())
208-
209198
// assert equality of metrics
210199
metricsAct := ilmAct.Metrics()
211200
metricsExp := ilmExp.Metrics()

‎processor/agentmetricsprocessor/utils_calculate_utilizations.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func (mtp *agentMetricsProcessor) calculateUtilizationMetric(usageMetric pdata.M
7777

7878
utilizationMetric.SetName(metricPostfixRegex.ReplaceAllString(usageMetric.Name(), "utilization"))
7979
utilizationMetric.SetDataType(pdata.MetricDataTypeDoubleGauge)
80-
utilizationMetric.DoubleGauge().InitEmpty()
80+
utilizationMetric.DoubleGauge()
8181

8282
metric := usageMetric
8383

‎processor/agentmetricsprocessor/utils_combine_process_metrics.go

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package agentmetricsprocessor
1616

1717
import (
18-
"errors"
1918
"fmt"
2019
"strconv"
2120
"strings"
@@ -51,10 +50,9 @@ import (
5150

5251
func combineProcessMetrics(rms pdata.ResourceMetricsSlice) error {
5352
resultMetrics := pdata.NewResourceMetrics()
54-
resultMetrics.InitEmpty()
5553
ilms := resultMetrics.InstrumentationLibraryMetrics()
5654
ilms.Resize(1)
57-
ilms.At(0).InitEmpty()
55+
ilms.At(0)
5856

5957
// create collection of combined process metrics, disregarding any ResourceMetrics
6058
// with no process resource attributes as "otherMetrics"
@@ -65,9 +63,7 @@ func combineProcessMetrics(rms pdata.ResourceMetricsSlice) error {
6563

6664
// if non-process specific metrics were supplied, initialize the result
6765
// with those metrics
68-
if !otherMetrics.IsNil() {
69-
resultMetrics = otherMetrics
70-
}
66+
resultMetrics = otherMetrics
7167

7268
// append all of the process metrics
7369
metrics := resultMetrics.InstrumentationLibraryMetrics().At(0).Metrics()
@@ -95,11 +91,6 @@ func createProcessMetrics(rms pdata.ResourceMetricsSlice) (processMetrics conver
9591
// if these ResourceMetrics do not contain process resource attributes,
9692
// these must be the "other" non-process metrics
9793
if !includesProcessAttributes(resource) {
98-
if !otherMetrics.IsNil() {
99-
err = errors.New("unexpectedly received multiple Resource Metrics without process attributes")
100-
return
101-
}
102-
10394
otherMetrics = rm
10495
continue
10596
}

‎processor/agentmetricsprocessor/utils_convert_non_monotonic_sums.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ func convertToGauge(metric pdata.Metric) {
5757
case pdata.MetricDataTypeIntSum:
5858
idps := metric.IntSum().DataPoints()
5959
metric.SetDataType(pdata.MetricDataTypeIntGauge)
60-
metric.IntGauge().InitEmpty()
60+
metric.IntGauge()
6161
idps.CopyTo(metric.IntGauge().DataPoints())
6262
case pdata.MetricDataTypeDoubleSum:
6363
ddps := metric.DoubleSum().DataPoints()
6464
metric.SetDataType(pdata.MetricDataTypeDoubleGauge)
65-
metric.DoubleGauge().InitEmpty()
65+
metric.DoubleGauge()
6666
ddps.CopyTo(metric.DoubleGauge().DataPoints())
6767
}
6868
}

‎processor/agentmetricsprocessor/utils_split_read_write.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ func splitReadWriteBytesMetrics(rms pdata.ResourceMetricsSlice) error {
7070
}
7171

7272
// append the new metrics to the collection, overwriting the old one
73-
metric.InitEmpty() // reset original metric to avoid effecting data points that are re-used in new metrics
7473
read.CopyTo(metric)
7574
metrics.Append(write)
7675
}

0 commit comments

Comments
 (0)