Skip to content

Commit 10b2ab5

Browse files
author
alrex
authored
rename memorylimiter -> memorylimiterprocessor (open-telemetry#5262)
* rename memorylimiter -> memorylimiterprocessor * make update-otel * rename configcheck.ValidateConfig -> configtest.CheckConfigStruct
1 parent 1fcc8fe commit 10b2ab5

File tree

327 files changed

+868
-888
lines changed

Some content is hidden

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

327 files changed

+868
-888
lines changed

cmd/configschema/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ require (
88
github.com/open-telemetry/opentelemetry-collector-contrib v0.35.0
99
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.35.0
1010
github.com/stretchr/testify v1.7.0
11-
go.opentelemetry.io/collector v0.35.1-0.20210915180232-9fcd2bb61979
12-
go.opentelemetry.io/collector/model v0.35.1-0.20210915180232-9fcd2bb61979
11+
go.opentelemetry.io/collector v0.35.1-0.20210917100632-e056aa8c4e20
12+
go.opentelemetry.io/collector/model v0.35.1-0.20210917100632-e056aa8c4e20
1313
golang.org/x/mod v0.4.2
1414
)
1515

cmd/configschema/go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -2206,13 +2206,13 @@ go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
22062206
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
22072207
go.opentelemetry.io/collector v0.28.0/go.mod h1:AP/BTXwo1eedoJO7V+HQ68CSvJU1lcdqOzJCgt1VsNs=
22082208
go.opentelemetry.io/collector v0.30.1/go.mod h1:ER3czrkP35ADgO89Q31KGljiQpPW09FKWrXRH61X4BM=
2209-
go.opentelemetry.io/collector v0.35.1-0.20210915180232-9fcd2bb61979 h1:lHdDlokssqj+G8kU1jN1iUyexJk8Xb/5yhBguCQPwrc=
2210-
go.opentelemetry.io/collector v0.35.1-0.20210915180232-9fcd2bb61979/go.mod h1:NCDJ8/IMS+RjM4+HsWrlFDMIgcx8Qom0ZKqZnYK42qI=
2209+
go.opentelemetry.io/collector v0.35.1-0.20210917100632-e056aa8c4e20 h1:WOET1larHjCs3RIhjhCD3qOI9O6JhtNp8NKyqVERQ9I=
2210+
go.opentelemetry.io/collector v0.35.1-0.20210917100632-e056aa8c4e20/go.mod h1:NCDJ8/IMS+RjM4+HsWrlFDMIgcx8Qom0ZKqZnYK42qI=
22112211
go.opentelemetry.io/collector/model v0.30.0/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4=
22122212
go.opentelemetry.io/collector/model v0.30.2-0.20210719230137-809cae954ed3/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4=
22132213
go.opentelemetry.io/collector/model v0.35.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
2214-
go.opentelemetry.io/collector/model v0.35.1-0.20210915180232-9fcd2bb61979 h1:Zo0ExoOI18KTUIJ2FKHNsKKgu0bjKUSdkohY8nqzi6s=
2215-
go.opentelemetry.io/collector/model v0.35.1-0.20210915180232-9fcd2bb61979/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
2214+
go.opentelemetry.io/collector/model v0.35.1-0.20210917100632-e056aa8c4e20 h1:WASw8GgkwnPDnZrVfXoxc0mjKs2gXcXhVRKTpwW7PaQ=
2215+
go.opentelemetry.io/collector/model v0.35.1-0.20210917100632-e056aa8c4e20/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
22162216
go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc=
22172217
go.opentelemetry.io/contrib v0.21.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM=
22182218
go.opentelemetry.io/contrib v0.23.0 h1:MgRuo0JZZX8J9WLRjyd7OpTSbaLOdQXXJa6SnZvlWLM=

exporter/alibabacloudlogserviceexporter/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ require (
77
github.com/gogo/protobuf v1.3.2
88
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.35.0
99
github.com/stretchr/testify v1.7.0
10-
go.opentelemetry.io/collector v0.35.1-0.20210915180232-9fcd2bb61979
11-
go.opentelemetry.io/collector/model v0.35.1-0.20210915180232-9fcd2bb61979
10+
go.opentelemetry.io/collector v0.35.1-0.20210917100632-e056aa8c4e20
11+
go.opentelemetry.io/collector/model v0.35.1-0.20210917100632-e056aa8c4e20
1212
go.uber.org/zap v1.19.1
1313
)
1414

exporter/alibabacloudlogserviceexporter/go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -513,11 +513,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
513513
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
514514
go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
515515
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
516-
go.opentelemetry.io/collector v0.35.1-0.20210915180232-9fcd2bb61979 h1:lHdDlokssqj+G8kU1jN1iUyexJk8Xb/5yhBguCQPwrc=
517-
go.opentelemetry.io/collector v0.35.1-0.20210915180232-9fcd2bb61979/go.mod h1:NCDJ8/IMS+RjM4+HsWrlFDMIgcx8Qom0ZKqZnYK42qI=
516+
go.opentelemetry.io/collector v0.35.1-0.20210917100632-e056aa8c4e20 h1:WOET1larHjCs3RIhjhCD3qOI9O6JhtNp8NKyqVERQ9I=
517+
go.opentelemetry.io/collector v0.35.1-0.20210917100632-e056aa8c4e20/go.mod h1:NCDJ8/IMS+RjM4+HsWrlFDMIgcx8Qom0ZKqZnYK42qI=
518518
go.opentelemetry.io/collector/model v0.35.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
519-
go.opentelemetry.io/collector/model v0.35.1-0.20210915180232-9fcd2bb61979 h1:Zo0ExoOI18KTUIJ2FKHNsKKgu0bjKUSdkohY8nqzi6s=
520-
go.opentelemetry.io/collector/model v0.35.1-0.20210915180232-9fcd2bb61979/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
519+
go.opentelemetry.io/collector/model v0.35.1-0.20210917100632-e056aa8c4e20 h1:WASw8GgkwnPDnZrVfXoxc0mjKs2gXcXhVRKTpwW7PaQ=
520+
go.opentelemetry.io/collector/model v0.35.1-0.20210917100632-e056aa8c4e20/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
521521
go.opentelemetry.io/contrib v0.23.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM=
522522
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.23.0/go.mod h1:RlEDuaJ0wF4rNG/GOd8zknRW44rKISkcdsp46kt+FcA=
523523
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.23.0/go.mod h1:wLrbAf2Qb+kFsEjowrxOcuy2SE0dcY0VwFiiYCmUeFQ=

exporter/awscloudwatchlogsexporter/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ go 1.17
55
require (
66
github.com/aws/aws-sdk-go v1.40.42
77
github.com/stretchr/testify v1.7.0
8-
go.opentelemetry.io/collector v0.35.1-0.20210915180232-9fcd2bb61979
9-
go.opentelemetry.io/collector/model v0.35.1-0.20210915180232-9fcd2bb61979
8+
go.opentelemetry.io/collector v0.35.1-0.20210917100632-e056aa8c4e20
9+
go.opentelemetry.io/collector/model v0.35.1-0.20210917100632-e056aa8c4e20
1010
go.uber.org/zap v1.19.1
1111
)
1212

exporter/awscloudwatchlogsexporter/go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -376,11 +376,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
376376
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
377377
go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
378378
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
379-
go.opentelemetry.io/collector v0.35.1-0.20210915180232-9fcd2bb61979 h1:lHdDlokssqj+G8kU1jN1iUyexJk8Xb/5yhBguCQPwrc=
380-
go.opentelemetry.io/collector v0.35.1-0.20210915180232-9fcd2bb61979/go.mod h1:NCDJ8/IMS+RjM4+HsWrlFDMIgcx8Qom0ZKqZnYK42qI=
379+
go.opentelemetry.io/collector v0.35.1-0.20210917100632-e056aa8c4e20 h1:WOET1larHjCs3RIhjhCD3qOI9O6JhtNp8NKyqVERQ9I=
380+
go.opentelemetry.io/collector v0.35.1-0.20210917100632-e056aa8c4e20/go.mod h1:NCDJ8/IMS+RjM4+HsWrlFDMIgcx8Qom0ZKqZnYK42qI=
381381
go.opentelemetry.io/collector/model v0.35.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
382-
go.opentelemetry.io/collector/model v0.35.1-0.20210915180232-9fcd2bb61979 h1:Zo0ExoOI18KTUIJ2FKHNsKKgu0bjKUSdkohY8nqzi6s=
383-
go.opentelemetry.io/collector/model v0.35.1-0.20210915180232-9fcd2bb61979/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
382+
go.opentelemetry.io/collector/model v0.35.1-0.20210917100632-e056aa8c4e20 h1:WASw8GgkwnPDnZrVfXoxc0mjKs2gXcXhVRKTpwW7PaQ=
383+
go.opentelemetry.io/collector/model v0.35.1-0.20210917100632-e056aa8c4e20/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
384384
go.opentelemetry.io/contrib v0.23.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM=
385385
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.23.0/go.mod h1:RlEDuaJ0wF4rNG/GOd8zknRW44rKISkcdsp46kt+FcA=
386386
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.23.0/go.mod h1:wLrbAf2Qb+kFsEjowrxOcuy2SE0dcY0VwFiiYCmUeFQ=

exporter/awsemfexporter/factory_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,14 @@ import (
2323
"github.com/stretchr/testify/require"
2424
"go.opentelemetry.io/collector/component/componenttest"
2525
"go.opentelemetry.io/collector/config"
26-
"go.opentelemetry.io/collector/config/configcheck"
2726
"go.opentelemetry.io/collector/config/configtest"
2827
)
2928

3029
func TestCreateDefaultConfig(t *testing.T) {
3130
factory := NewFactory()
3231
cfg := factory.CreateDefaultConfig()
3332
assert.NotNil(t, cfg, "failed to create default config")
34-
assert.NoError(t, configcheck.ValidateConfig(cfg))
33+
assert.NoError(t, configtest.CheckConfigStruct(cfg))
3534
}
3635

3736
func TestCreateTracesExporter(t *testing.T) {

exporter/awsemfexporter/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ require (
1212
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.35.0
1313
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.35.0
1414
github.com/stretchr/testify v1.7.0
15-
go.opentelemetry.io/collector v0.35.1-0.20210915180232-9fcd2bb61979
16-
go.opentelemetry.io/collector/model v0.35.1-0.20210915180232-9fcd2bb61979
15+
go.opentelemetry.io/collector v0.35.1-0.20210917100632-e056aa8c4e20
16+
go.opentelemetry.io/collector/model v0.35.1-0.20210917100632-e056aa8c4e20
1717
go.uber.org/zap v1.19.1
1818
google.golang.org/protobuf v1.27.1
1919
)

exporter/awsemfexporter/go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -401,11 +401,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
401401
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
402402
go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
403403
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
404-
go.opentelemetry.io/collector v0.35.1-0.20210915180232-9fcd2bb61979 h1:lHdDlokssqj+G8kU1jN1iUyexJk8Xb/5yhBguCQPwrc=
405-
go.opentelemetry.io/collector v0.35.1-0.20210915180232-9fcd2bb61979/go.mod h1:NCDJ8/IMS+RjM4+HsWrlFDMIgcx8Qom0ZKqZnYK42qI=
404+
go.opentelemetry.io/collector v0.35.1-0.20210917100632-e056aa8c4e20 h1:WOET1larHjCs3RIhjhCD3qOI9O6JhtNp8NKyqVERQ9I=
405+
go.opentelemetry.io/collector v0.35.1-0.20210917100632-e056aa8c4e20/go.mod h1:NCDJ8/IMS+RjM4+HsWrlFDMIgcx8Qom0ZKqZnYK42qI=
406406
go.opentelemetry.io/collector/model v0.35.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
407-
go.opentelemetry.io/collector/model v0.35.1-0.20210915180232-9fcd2bb61979 h1:Zo0ExoOI18KTUIJ2FKHNsKKgu0bjKUSdkohY8nqzi6s=
408-
go.opentelemetry.io/collector/model v0.35.1-0.20210915180232-9fcd2bb61979/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
407+
go.opentelemetry.io/collector/model v0.35.1-0.20210917100632-e056aa8c4e20 h1:WASw8GgkwnPDnZrVfXoxc0mjKs2gXcXhVRKTpwW7PaQ=
408+
go.opentelemetry.io/collector/model v0.35.1-0.20210917100632-e056aa8c4e20/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
409409
go.opentelemetry.io/contrib v0.23.0 h1:MgRuo0JZZX8J9WLRjyd7OpTSbaLOdQXXJa6SnZvlWLM=
410410
go.opentelemetry.io/contrib v0.23.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM=
411411
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.23.0 h1:mMzWiJCJv7iC8yOFI0azfmmTuMFaaWVEObHH8LQaw8o=

exporter/awskinesisexporter/config_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"github.com/stretchr/testify/require"
2323
"go.opentelemetry.io/collector/component/componenttest"
2424
"go.opentelemetry.io/collector/config"
25-
"go.opentelemetry.io/collector/config/configcheck"
2625
"go.opentelemetry.io/collector/config/configtest"
2726
)
2827

@@ -106,5 +105,5 @@ func TestConfig(t *testing.T) {
106105

107106
func TestConfigCheck(t *testing.T) {
108107
cfg := (NewFactory()).CreateDefaultConfig()
109-
assert.NoError(t, configcheck.ValidateConfig(cfg))
108+
assert.NoError(t, configtest.CheckConfigStruct(cfg))
110109
}

exporter/awskinesisexporter/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ require (
66
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.35.0
77
github.com/signalfx/opencensus-go-exporter-kinesis v0.6.3
88
github.com/stretchr/testify v1.7.0
9-
go.opentelemetry.io/collector v0.35.1-0.20210915180232-9fcd2bb61979
10-
go.opentelemetry.io/collector/model v0.35.1-0.20210915180232-9fcd2bb61979
9+
go.opentelemetry.io/collector v0.35.1-0.20210917100632-e056aa8c4e20
10+
go.opentelemetry.io/collector/model v0.35.1-0.20210917100632-e056aa8c4e20
1111
go.uber.org/zap v1.19.1
1212
)
1313

exporter/awskinesisexporter/go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -1018,11 +1018,11 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
10181018
go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
10191019
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
10201020
go.opentelemetry.io/collector v0.28.0/go.mod h1:AP/BTXwo1eedoJO7V+HQ68CSvJU1lcdqOzJCgt1VsNs=
1021-
go.opentelemetry.io/collector v0.35.1-0.20210915180232-9fcd2bb61979 h1:lHdDlokssqj+G8kU1jN1iUyexJk8Xb/5yhBguCQPwrc=
1022-
go.opentelemetry.io/collector v0.35.1-0.20210915180232-9fcd2bb61979/go.mod h1:NCDJ8/IMS+RjM4+HsWrlFDMIgcx8Qom0ZKqZnYK42qI=
1021+
go.opentelemetry.io/collector v0.35.1-0.20210917100632-e056aa8c4e20 h1:WOET1larHjCs3RIhjhCD3qOI9O6JhtNp8NKyqVERQ9I=
1022+
go.opentelemetry.io/collector v0.35.1-0.20210917100632-e056aa8c4e20/go.mod h1:NCDJ8/IMS+RjM4+HsWrlFDMIgcx8Qom0ZKqZnYK42qI=
10231023
go.opentelemetry.io/collector/model v0.35.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
1024-
go.opentelemetry.io/collector/model v0.35.1-0.20210915180232-9fcd2bb61979 h1:Zo0ExoOI18KTUIJ2FKHNsKKgu0bjKUSdkohY8nqzi6s=
1025-
go.opentelemetry.io/collector/model v0.35.1-0.20210915180232-9fcd2bb61979/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
1024+
go.opentelemetry.io/collector/model v0.35.1-0.20210917100632-e056aa8c4e20 h1:WASw8GgkwnPDnZrVfXoxc0mjKs2gXcXhVRKTpwW7PaQ=
1025+
go.opentelemetry.io/collector/model v0.35.1-0.20210917100632-e056aa8c4e20/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
10261026
go.opentelemetry.io/contrib v0.23.0 h1:MgRuo0JZZX8J9WLRjyd7OpTSbaLOdQXXJa6SnZvlWLM=
10271027
go.opentelemetry.io/contrib v0.23.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM=
10281028
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.23.0 h1:mMzWiJCJv7iC8yOFI0azfmmTuMFaaWVEObHH8LQaw8o=

exporter/awsprometheusremotewriteexporter/factory_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"go.opentelemetry.io/collector/component"
2424
"go.opentelemetry.io/collector/component/componenttest"
2525
"go.opentelemetry.io/collector/config"
26-
"go.opentelemetry.io/collector/config/configcheck"
2726
"go.opentelemetry.io/collector/config/confighttp"
27+
"go.opentelemetry.io/collector/config/configtest"
2828
"go.opentelemetry.io/collector/config/configtls"
2929
)
3030

@@ -38,7 +38,7 @@ func TestCreateDefaultConfig(t *testing.T) {
3838
af := NewFactory()
3939
cfg := af.CreateDefaultConfig()
4040
assert.NotNil(t, cfg, "failed to create default config")
41-
assert.NoError(t, configcheck.ValidateConfig(cfg))
41+
assert.NoError(t, configtest.CheckConfigStruct(cfg))
4242
}
4343

4444
//Tests whether or not a correct Metrics Exporter from the default Config parameters

exporter/awsprometheusremotewriteexporter/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/aws/aws-sdk-go v1.40.42
77
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.35.0
88
github.com/stretchr/testify v1.7.0
9-
go.opentelemetry.io/collector v0.35.1-0.20210915180232-9fcd2bb61979
9+
go.opentelemetry.io/collector v0.35.1-0.20210917100632-e056aa8c4e20
1010
)
1111

1212
require (
@@ -34,7 +34,7 @@ require (
3434
github.com/tidwall/tinylru v1.0.2 // indirect
3535
github.com/tidwall/wal v0.1.5 // indirect
3636
go.opencensus.io v0.23.0 // indirect
37-
go.opentelemetry.io/collector/model v0.35.1-0.20210915180232-9fcd2bb61979 // indirect
37+
go.opentelemetry.io/collector/model v0.35.1-0.20210917100632-e056aa8c4e20 // indirect
3838
go.opentelemetry.io/contrib v0.23.0 // indirect
3939
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.23.0 // indirect
4040
go.opentelemetry.io/otel v1.0.0-RC3 // indirect

exporter/awsprometheusremotewriteexporter/go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -984,11 +984,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
984984
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
985985
go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
986986
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
987-
go.opentelemetry.io/collector v0.35.1-0.20210915180232-9fcd2bb61979 h1:lHdDlokssqj+G8kU1jN1iUyexJk8Xb/5yhBguCQPwrc=
988-
go.opentelemetry.io/collector v0.35.1-0.20210915180232-9fcd2bb61979/go.mod h1:NCDJ8/IMS+RjM4+HsWrlFDMIgcx8Qom0ZKqZnYK42qI=
987+
go.opentelemetry.io/collector v0.35.1-0.20210917100632-e056aa8c4e20 h1:WOET1larHjCs3RIhjhCD3qOI9O6JhtNp8NKyqVERQ9I=
988+
go.opentelemetry.io/collector v0.35.1-0.20210917100632-e056aa8c4e20/go.mod h1:NCDJ8/IMS+RjM4+HsWrlFDMIgcx8Qom0ZKqZnYK42qI=
989989
go.opentelemetry.io/collector/model v0.35.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
990-
go.opentelemetry.io/collector/model v0.35.1-0.20210915180232-9fcd2bb61979 h1:Zo0ExoOI18KTUIJ2FKHNsKKgu0bjKUSdkohY8nqzi6s=
991-
go.opentelemetry.io/collector/model v0.35.1-0.20210915180232-9fcd2bb61979/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
990+
go.opentelemetry.io/collector/model v0.35.1-0.20210917100632-e056aa8c4e20 h1:WASw8GgkwnPDnZrVfXoxc0mjKs2gXcXhVRKTpwW7PaQ=
991+
go.opentelemetry.io/collector/model v0.35.1-0.20210917100632-e056aa8c4e20/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
992992
go.opentelemetry.io/contrib v0.23.0 h1:MgRuo0JZZX8J9WLRjyd7OpTSbaLOdQXXJa6SnZvlWLM=
993993
go.opentelemetry.io/contrib v0.23.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM=
994994
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.23.0 h1:mMzWiJCJv7iC8yOFI0azfmmTuMFaaWVEObHH8LQaw8o=

exporter/awsxrayexporter/factory_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"github.com/stretchr/testify/require"
2424
"go.opentelemetry.io/collector/component/componenttest"
2525
"go.opentelemetry.io/collector/config"
26-
"go.opentelemetry.io/collector/config/configcheck"
2726
"go.opentelemetry.io/collector/config/configtest"
2827

2928
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil"
@@ -47,7 +46,7 @@ func TestCreateDefaultConfig(t *testing.T) {
4746
RoleARN: "",
4847
},
4948
}, "failed to create default config")
50-
assert.NoError(t, configcheck.ValidateConfig(cfg))
49+
assert.NoError(t, configtest.CheckConfigStruct(cfg))
5150
}
5251

5352
func TestCreateTracesExporter(t *testing.T) {

exporter/awsxrayexporter/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ require (
88
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.35.0
99
github.com/stretchr/objx v0.2.0 // indirect
1010
github.com/stretchr/testify v1.7.0
11-
go.opentelemetry.io/collector v0.35.1-0.20210915180232-9fcd2bb61979
12-
go.opentelemetry.io/collector/model v0.35.1-0.20210915180232-9fcd2bb61979
11+
go.opentelemetry.io/collector v0.35.1-0.20210917100632-e056aa8c4e20
12+
go.opentelemetry.io/collector/model v0.35.1-0.20210917100632-e056aa8c4e20
1313
go.uber.org/zap v1.19.1
1414

1515
)

exporter/awsxrayexporter/go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -384,11 +384,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
384384
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
385385
go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
386386
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
387-
go.opentelemetry.io/collector v0.35.1-0.20210915180232-9fcd2bb61979 h1:lHdDlokssqj+G8kU1jN1iUyexJk8Xb/5yhBguCQPwrc=
388-
go.opentelemetry.io/collector v0.35.1-0.20210915180232-9fcd2bb61979/go.mod h1:NCDJ8/IMS+RjM4+HsWrlFDMIgcx8Qom0ZKqZnYK42qI=
387+
go.opentelemetry.io/collector v0.35.1-0.20210917100632-e056aa8c4e20 h1:WOET1larHjCs3RIhjhCD3qOI9O6JhtNp8NKyqVERQ9I=
388+
go.opentelemetry.io/collector v0.35.1-0.20210917100632-e056aa8c4e20/go.mod h1:NCDJ8/IMS+RjM4+HsWrlFDMIgcx8Qom0ZKqZnYK42qI=
389389
go.opentelemetry.io/collector/model v0.35.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
390-
go.opentelemetry.io/collector/model v0.35.1-0.20210915180232-9fcd2bb61979 h1:Zo0ExoOI18KTUIJ2FKHNsKKgu0bjKUSdkohY8nqzi6s=
391-
go.opentelemetry.io/collector/model v0.35.1-0.20210915180232-9fcd2bb61979/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
390+
go.opentelemetry.io/collector/model v0.35.1-0.20210917100632-e056aa8c4e20 h1:WASw8GgkwnPDnZrVfXoxc0mjKs2gXcXhVRKTpwW7PaQ=
391+
go.opentelemetry.io/collector/model v0.35.1-0.20210917100632-e056aa8c4e20/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
392392
go.opentelemetry.io/contrib v0.23.0 h1:MgRuo0JZZX8J9WLRjyd7OpTSbaLOdQXXJa6SnZvlWLM=
393393
go.opentelemetry.io/contrib v0.23.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM=
394394
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.23.0 h1:mMzWiJCJv7iC8yOFI0azfmmTuMFaaWVEObHH8LQaw8o=

exporter/azuremonitorexporter/config_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"github.com/stretchr/testify/require"
2424
"go.opentelemetry.io/collector/component/componenttest"
2525
"go.opentelemetry.io/collector/config"
26-
"go.opentelemetry.io/collector/config/configcheck"
2726
"go.opentelemetry.io/collector/config/configtest"
2827
)
2928

@@ -44,7 +43,7 @@ func TestLoadConfig(t *testing.T) {
4443
assert.Equal(t, factory.CreateDefaultConfig(), exporter)
4544

4645
exporter = cfg.Exporters[config.NewIDWithName(typeStr, "2")].(*Config)
47-
assert.NoError(t, configcheck.ValidateConfig(exporter))
46+
assert.NoError(t, configtest.CheckConfigStruct(exporter))
4847
assert.Equal(
4948
t,
5049
&Config{

exporter/azuremonitorexporter/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ require (
88
github.com/microsoft/ApplicationInsights-Go v0.4.4
99
github.com/stretchr/objx v0.2.0 // indirect
1010
github.com/stretchr/testify v1.7.0
11-
go.opentelemetry.io/collector v0.35.1-0.20210915180232-9fcd2bb61979
12-
go.opentelemetry.io/collector/model v0.35.1-0.20210915180232-9fcd2bb61979
11+
go.opentelemetry.io/collector v0.35.1-0.20210917100632-e056aa8c4e20
12+
go.opentelemetry.io/collector/model v0.35.1-0.20210917100632-e056aa8c4e20
1313
go.uber.org/zap v1.19.1
1414
golang.org/x/net v0.0.0-20210614182718-04defd469f4e
1515

0 commit comments

Comments
 (0)