Skip to content

Commit 9905ab0

Browse files
bogdandrutubogdandrutu
authored
Update core dependency (#373)
Signed-off-by: Bogdan Drutu <[email protected]>
1 parent 1f4c9ab commit 9905ab0

File tree

79 files changed

+233
-239
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+233
-239
lines changed

‎cmd/otelcontribcol/components_docs_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"testing"
2020

2121
"github.com/stretchr/testify/require"
22-
"go.opentelemetry.io/collector/component/componentdocs"
22+
"go.opentelemetry.io/collector/component/componenttest"
2323
)
2424

2525
const (
@@ -40,7 +40,7 @@ func TestComponentDocs(t *testing.T) {
4040
// Absolute path to the project root directory
4141
projectPath := filepath.Join(wd, "../../")
4242

43-
err = componentdocs.VerifyComponentDocumentation(
43+
err = componenttest.CheckDocs(
4444
projectPath,
4545
relativeDefaultComponentsPath,
4646
projectGoModule,

‎exporter/alibabacloudlogserviceexporter/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ require (
88
github.com/gogo/protobuf v1.3.1
99
github.com/golang/protobuf v1.3.5
1010
github.com/stretchr/testify v1.5.1
11-
go.opentelemetry.io/collector v0.4.1-0.20200625162555-bd886e86b7ca
11+
go.opentelemetry.io/collector v0.4.1-0.20200629203949-144127fb4481
1212
go.uber.org/zap v1.13.0
1313
)

‎exporter/alibabacloudlogserviceexporter/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,8 +1138,8 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
11381138
go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA=
11391139
go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8=
11401140
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
1141-
go.opentelemetry.io/collector v0.4.1-0.20200625162555-bd886e86b7ca h1:+urdY9aDT4AwvWqXTu50i8eYvUwDkhIqATdgS3Lifg4=
1142-
go.opentelemetry.io/collector v0.4.1-0.20200625162555-bd886e86b7ca/go.mod h1:juNgdIOeoSK3HhLrV6IMbxLqp9MG0FoqxtWFwpdV6ug=
1141+
go.opentelemetry.io/collector v0.4.1-0.20200629203949-144127fb4481 h1:vEaDDh4waM90RCc3Puz2NhcHAHJ760EUJCsYwV5iiEs=
1142+
go.opentelemetry.io/collector v0.4.1-0.20200629203949-144127fb4481/go.mod h1:2M1pW+lhEY/0lBoppQMH43PdHvMejcPEOD/NtR1IaoU=
11431143
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
11441144
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
11451145
go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

‎exporter/alibabacloudlogserviceexporter/metrics_exporter_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/stretchr/testify/assert"
2424
"github.com/stretchr/testify/require"
2525
"go.opentelemetry.io/collector/consumer/consumerdata"
26-
"go.opentelemetry.io/collector/testutils/metricstestutils"
26+
"go.opentelemetry.io/collector/testutil/metricstestutil"
2727
"go.uber.org/zap"
2828
)
2929

@@ -42,12 +42,12 @@ func TestNewMetricsExporter(t *testing.T) {
4242
tsUnix := time.Unix(unixSecs, unixNSecs)
4343

4444
doubleVal := 1234.5678
45-
doublePt := metricstestutils.Double(tsUnix, doubleVal)
45+
doublePt := metricstestutil.Double(tsUnix, doubleVal)
4646

4747
// This will put trace data to send buffer and return success.
4848
err = got.ConsumeMetricsData(context.Background(), consumerdata.MetricsData{
4949
Metrics: []*metricspb.Metric{
50-
metricstestutils.Gauge("gauge_double_with_dims", nil, metricstestutils.Timeseries(tsUnix, nil, doublePt)),
50+
metricstestutil.Gauge("gauge_double_with_dims", nil, metricstestutil.Timeseries(tsUnix, nil, doublePt)),
5151
}})
5252
// a
5353
assert.Error(t, err)

‎exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice_test.go

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"github.com/gogo/protobuf/proto"
2929
"github.com/stretchr/testify/assert"
3030
"go.opentelemetry.io/collector/consumer/consumerdata"
31-
"go.opentelemetry.io/collector/testutils/metricstestutils"
31+
"go.opentelemetry.io/collector/testutil/metricstestutil"
3232
"go.uber.org/zap"
3333
)
3434

@@ -43,24 +43,24 @@ func TestMetricDataToLogService(t *testing.T) {
4343
tsUnix := time.Unix(unixSecs, unixNSecs)
4444

4545
doubleVal := 1234.5678
46-
doublePt := metricstestutils.Double(tsUnix, doubleVal)
46+
doublePt := metricstestutil.Double(tsUnix, doubleVal)
4747
int64Val := int64(123)
4848
int64Pt := &metricspb.Point{
49-
Timestamp: metricstestutils.Timestamp(tsUnix),
49+
Timestamp: metricstestutil.Timestamp(tsUnix),
5050
Value: &metricspb.Point_Int64Value{Int64Value: int64Val},
5151
}
5252

5353
distributionBounds := []float64{1, 2, 4}
5454
distributionCounts := []int64{4, 2, 3, 7}
55-
distributionTimeSeries := metricstestutils.Timeseries(
55+
distributionTimeSeries := metricstestutil.Timeseries(
5656
tsUnix,
5757
values,
58-
metricstestutils.DistPt(tsUnix, distributionBounds, distributionCounts))
58+
metricstestutil.DistPt(tsUnix, distributionBounds, distributionCounts))
5959

60-
summaryTimeSeries := metricstestutils.Timeseries(
60+
summaryTimeSeries := metricstestutil.Timeseries(
6161
tsUnix,
6262
values,
63-
metricstestutils.SummPt(
63+
metricstestutil.SummPt(
6464
tsUnix,
6565
11,
6666
111,
@@ -87,10 +87,10 @@ func TestMetricDataToLogService(t *testing.T) {
8787
metricsDataFn: func() consumerdata.MetricsData {
8888
return consumerdata.MetricsData{
8989
Metrics: []*metricspb.Metric{
90-
metricstestutils.Gauge("gauge_double_with_dims", nil, metricstestutils.Timeseries(tsUnix, nil, doublePt)),
91-
metricstestutils.GaugeInt("gauge_int_with_dims", nil, metricstestutils.Timeseries(tsUnix, nil, int64Pt)),
92-
metricstestutils.Cumulative("cumulative_double_with_dims", nil, metricstestutils.Timeseries(tsUnix, nil, doublePt)),
93-
metricstestutils.CumulativeInt("cumulative_int_with_dims", nil, metricstestutils.Timeseries(tsUnix, nil, int64Pt)),
90+
metricstestutil.Gauge("gauge_double_with_dims", nil, metricstestutil.Timeseries(tsUnix, nil, doublePt)),
91+
metricstestutil.GaugeInt("gauge_int_with_dims", nil, metricstestutil.Timeseries(tsUnix, nil, int64Pt)),
92+
metricstestutil.Cumulative("cumulative_double_with_dims", nil, metricstestutil.Timeseries(tsUnix, nil, doublePt)),
93+
metricstestutil.CumulativeInt("cumulative_int_with_dims", nil, metricstestutil.Timeseries(tsUnix, nil, int64Pt)),
9494
},
9595
}
9696
},
@@ -100,10 +100,10 @@ func TestMetricDataToLogService(t *testing.T) {
100100
metricsDataFn: func() consumerdata.MetricsData {
101101
return consumerdata.MetricsData{
102102
Metrics: []*metricspb.Metric{
103-
metricstestutils.Gauge("gauge_double_with_dims", keys, metricstestutils.Timeseries(tsUnix, values, doublePt)),
104-
metricstestutils.GaugeInt("gauge_int_with_dims", keys, metricstestutils.Timeseries(tsUnix, values, int64Pt)),
105-
metricstestutils.Cumulative("cumulative_double_with_dims", keys, metricstestutils.Timeseries(tsUnix, values, doublePt)),
106-
metricstestutils.CumulativeInt("cumulative_int_with_dims", keys, metricstestutils.Timeseries(tsUnix, values, int64Pt)),
103+
metricstestutil.Gauge("gauge_double_with_dims", keys, metricstestutil.Timeseries(tsUnix, values, doublePt)),
104+
metricstestutil.GaugeInt("gauge_int_with_dims", keys, metricstestutil.Timeseries(tsUnix, values, int64Pt)),
105+
metricstestutil.Cumulative("cumulative_double_with_dims", keys, metricstestutil.Timeseries(tsUnix, values, doublePt)),
106+
metricstestutil.CumulativeInt("cumulative_int_with_dims", keys, metricstestutil.Timeseries(tsUnix, values, int64Pt)),
107107
},
108108
}
109109
},
@@ -130,8 +130,8 @@ func TestMetricDataToLogService(t *testing.T) {
130130
Type: "service",
131131
},
132132
Metrics: []*metricspb.Metric{
133-
metricstestutils.Gauge("gauge_double_with_dims", keys, metricstestutils.Timeseries(tsUnix, values, doublePt)),
134-
metricstestutils.GaugeInt("gauge_int_with_dims", keys, metricstestutils.Timeseries(tsUnix, values, int64Pt)),
133+
metricstestutil.Gauge("gauge_double_with_dims", keys, metricstestutil.Timeseries(tsUnix, values, doublePt)),
134+
metricstestutil.GaugeInt("gauge_int_with_dims", keys, metricstestutil.Timeseries(tsUnix, values, int64Pt)),
135135
},
136136
}
137137
},
@@ -141,8 +141,8 @@ func TestMetricDataToLogService(t *testing.T) {
141141
metricsDataFn: func() consumerdata.MetricsData {
142142
return consumerdata.MetricsData{
143143
Metrics: []*metricspb.Metric{
144-
metricstestutils.GaugeDist("gauge_distrib", keys, distributionTimeSeries),
145-
metricstestutils.CumulativeDist("cumulative_distrib", keys, distributionTimeSeries),
144+
metricstestutil.GaugeDist("gauge_distrib", keys, distributionTimeSeries),
145+
metricstestutil.CumulativeDist("cumulative_distrib", keys, distributionTimeSeries),
146146
},
147147
}
148148
},
@@ -152,7 +152,7 @@ func TestMetricDataToLogService(t *testing.T) {
152152
metricsDataFn: func() consumerdata.MetricsData {
153153
return consumerdata.MetricsData{
154154
Metrics: []*metricspb.Metric{
155-
metricstestutils.Summary("summary", keys, summaryTimeSeries),
155+
metricstestutil.Summary("summary", keys, summaryTimeSeries),
156156
},
157157
}
158158
},
@@ -215,10 +215,10 @@ func TestInvalidMetric(t *testing.T) {
215215
tsUnix := time.Unix(unixSecs, unixNSecs)
216216

217217
doubleVal := 1234.5678
218-
doublePt := metricstestutils.Double(tsUnix, doubleVal)
218+
doublePt := metricstestutil.Double(tsUnix, doubleVal)
219219
metricData := &consumerdata.MetricsData{
220220
Metrics: []*metricspb.Metric{
221-
metricstestutils.Gauge("gauge_double_with_dims", nil, metricstestutils.Timeseries(tsUnix, nil, doublePt)),
221+
metricstestutil.Gauge("gauge_double_with_dims", nil, metricstestutil.Timeseries(tsUnix, nil, doublePt)),
222222
},
223223
}
224224
// invalid timestamp

‎exporter/awsxrayexporter/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/mattn/go-isatty v0.0.10 // indirect
88
github.com/open-telemetry/opentelemetry-proto v0.3.0
99
github.com/stretchr/testify v1.5.1
10-
go.opentelemetry.io/collector v0.4.1-0.20200625162555-bd886e86b7ca
10+
go.opentelemetry.io/collector v0.4.1-0.20200629203949-144127fb4481
1111
go.uber.org/zap v1.13.0
1212
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
1313
)

‎exporter/awsxrayexporter/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1334,8 +1334,8 @@ go.opencensus.io v0.22.1 h1:8dP3SGL7MPB94crU3bEPplMPe83FI4EouesJUeFHv50=
13341334
go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA=
13351335
go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8=
13361336
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
1337-
go.opentelemetry.io/collector v0.4.1-0.20200625162555-bd886e86b7ca h1:+urdY9aDT4AwvWqXTu50i8eYvUwDkhIqATdgS3Lifg4=
1338-
go.opentelemetry.io/collector v0.4.1-0.20200625162555-bd886e86b7ca/go.mod h1:juNgdIOeoSK3HhLrV6IMbxLqp9MG0FoqxtWFwpdV6ug=
1337+
go.opentelemetry.io/collector v0.4.1-0.20200629203949-144127fb4481 h1:vEaDDh4waM90RCc3Puz2NhcHAHJ760EUJCsYwV5iiEs=
1338+
go.opentelemetry.io/collector v0.4.1-0.20200629203949-144127fb4481/go.mod h1:2M1pW+lhEY/0lBoppQMH43PdHvMejcPEOD/NtR1IaoU=
13391339
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
13401340
go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU=
13411341
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=

‎exporter/azuremonitorexporter/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/golang/protobuf v1.3.5
1111
github.com/stretchr/testify v1.5.1
1212
github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 // indirect
13-
go.opentelemetry.io/collector v0.4.1-0.20200625162555-bd886e86b7ca
13+
go.opentelemetry.io/collector v0.4.1-0.20200629203949-144127fb4481
1414
go.uber.org/zap v1.13.0
1515
google.golang.org/appengine v1.6.2 // indirect
1616
google.golang.org/grpc v1.29.1

‎exporter/azuremonitorexporter/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1235,8 +1235,8 @@ go.opencensus.io v0.22.1 h1:8dP3SGL7MPB94crU3bEPplMPe83FI4EouesJUeFHv50=
12351235
go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA=
12361236
go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8=
12371237
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
1238-
go.opentelemetry.io/collector v0.4.1-0.20200625162555-bd886e86b7ca h1:+urdY9aDT4AwvWqXTu50i8eYvUwDkhIqATdgS3Lifg4=
1239-
go.opentelemetry.io/collector v0.4.1-0.20200625162555-bd886e86b7ca/go.mod h1:juNgdIOeoSK3HhLrV6IMbxLqp9MG0FoqxtWFwpdV6ug=
1238+
go.opentelemetry.io/collector v0.4.1-0.20200629203949-144127fb4481 h1:vEaDDh4waM90RCc3Puz2NhcHAHJ760EUJCsYwV5iiEs=
1239+
go.opentelemetry.io/collector v0.4.1-0.20200629203949-144127fb4481/go.mod h1:2M1pW+lhEY/0lBoppQMH43PdHvMejcPEOD/NtR1IaoU=
12401240
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
12411241
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
12421242
go.uber.org/atomic v1.5.0 h1:OI5t8sDa1Or+q8AeE+yKeB/SDYioSHAgcVljj9JIETY=

‎exporter/carbonexporter/exporter_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ import (
3434
"go.opentelemetry.io/collector/component/componenttest"
3535
"go.opentelemetry.io/collector/consumer/consumerdata"
3636
"go.opentelemetry.io/collector/exporter/exporterhelper"
37-
"go.opentelemetry.io/collector/testutils"
38-
"go.opentelemetry.io/collector/testutils/metricstestutils"
37+
"go.opentelemetry.io/collector/testutil"
38+
"go.opentelemetry.io/collector/testutil/metricstestutil"
3939
)
4040

4141
func TestNew(t *testing.T) {
@@ -78,17 +78,17 @@ func TestNew(t *testing.T) {
7878
}
7979

8080
func TestConsumeMetricsData(t *testing.T) {
81-
addr := testutils.GetAvailableLocalAddress(t)
81+
addr := testutil.GetAvailableLocalAddress(t)
8282

8383
smallBatch := consumerdata.MetricsData{
8484
Metrics: []*metricspb.Metric{
85-
metricstestutils.Gauge(
85+
metricstestutil.Gauge(
8686
"test_gauge",
8787
[]string{"k0", "k1"},
88-
metricstestutils.Timeseries(
88+
metricstestutil.Timeseries(
8989
time.Now(),
9090
[]string{"v0", "v1"},
91-
metricstestutils.Double(time.Now(), 123))),
91+
metricstestutil.Double(time.Now(), 123))),
9292
},
9393
}
9494

@@ -203,7 +203,7 @@ func TestConsumeMetricsData(t *testing.T) {
203203
// Other tests didn't for the concurrency aspect of connPool, this test
204204
// is designed to force that.
205205
func Test_connPool_Concurrency(t *testing.T) {
206-
addr := testutils.GetAvailableLocalAddress(t)
206+
addr := testutil.GetAvailableLocalAddress(t)
207207
laddr, err := net.ResolveTCPAddr("tcp", addr)
208208
require.NoError(t, err)
209209
ln, err := net.ListenTCP("tcp", laddr)
@@ -286,14 +286,14 @@ func generateLargeBatch(t *testing.T) consumerdata.MetricsData {
286286
ts := time.Now()
287287
for i := 0; i < 65000; i++ {
288288
md.Metrics = append(md.Metrics,
289-
metricstestutils.Gauge(
289+
metricstestutil.Gauge(
290290
"test_"+strconv.Itoa(i),
291291
[]string{"k0", "k1"},
292-
metricstestutils.Timeseries(
292+
metricstestutil.Timeseries(
293293
time.Now(),
294294
[]string{"v0", "v1"},
295295
&metricspb.Point{
296-
Timestamp: metricstestutils.Timestamp(ts),
296+
Timestamp: metricstestutil.Timestamp(ts),
297297
Value: &metricspb.Point_Int64Value{Int64Value: int64(i)},
298298
},
299299
),

0 commit comments

Comments
 (0)