Skip to content

Commit

Permalink
[testbed] disable setting grpc log, update calls to featuregate (#9564)
Browse files Browse the repository at this point in the history 
This change includes:
- set the flag to disable setting the grpc logger from the `InProcessCollector`
- `make update-otel`
- update calls to `featuregate` as a result of open-telemetry/opentelemetry-collector@addf0ef
- update tests as a result of open-telemetry/opentelemetry-collector@5658f35
  • Loading branch information
Alex Boten committed Apr 28, 2022
1 parent 4259a2b commit b9915f7
Show file tree
Hide file tree
Showing 332 changed files with 950 additions and 949 deletions.
4 changes: 2 additions & 2 deletions cmd/configschema/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.49.0
github.com/stretchr/testify v1.7.1
go.opentelemetry.io/collector v0.49.1-0.20220425174313-0674425b8ef2
go.opentelemetry.io/collector/pdata v0.49.1-0.20220425174313-0674425b8ef2
go.opentelemetry.io/collector v0.49.1-0.20220428142054-b34df3a7e7e9
go.opentelemetry.io/collector/pdata v0.49.1-0.20220428142054-b34df3a7e7e9
go.uber.org/multierr v1.8.0
golang.org/x/mod v0.5.1
golang.org/x/text v0.3.7
Expand Down
6 changes: 4 additions & 2 deletions cmd/configschema/go.sum
View file

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

4 changes: 2 additions & 2 deletions cmd/mdatagen/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ require (
github.com/go-playground/universal-translator v0.18.0
github.com/go-playground/validator/v10 v10.10.1
github.com/stretchr/testify v1.7.1
go.opentelemetry.io/collector v0.49.1-0.20220425174313-0674425b8ef2
go.opentelemetry.io/collector/pdata v0.49.1-0.20220425174313-0674425b8ef2
go.opentelemetry.io/collector v0.49.1-0.20220428142054-b34df3a7e7e9
go.opentelemetry.io/collector/pdata v0.49.1-0.20220428142054-b34df3a7e7e9
)

require (
Expand Down
8 changes: 4 additions & 4 deletions cmd/mdatagen/go.sum
View file

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

4 changes: 2 additions & 2 deletions exporter/alibabacloudlogserviceexporter/go.mod
View file
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.49.0
github.com/stretchr/testify v1.7.1
go.opentelemetry.io/collector v0.49.1-0.20220425174313-0674425b8ef2
go.opentelemetry.io/collector/pdata v0.49.1-0.20220425174313-0674425b8ef2
go.opentelemetry.io/collector v0.49.1-0.20220428142054-b34df3a7e7e9
go.opentelemetry.io/collector/pdata v0.49.1-0.20220428142054-b34df3a7e7e9
go.opentelemetry.io/collector/semconv v0.0.0-20220422001137-87ab5de64ce4
go.uber.org/zap v1.21.0
)
Expand Down
8 changes: 4 additions & 4 deletions exporter/alibabacloudlogserviceexporter/go.sum
View file

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
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/awsutil v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.49.0
github.com/stretchr/testify v1.7.1
go.opentelemetry.io/collector v0.49.1-0.20220425174313-0674425b8ef2
go.opentelemetry.io/collector/pdata v0.49.1-0.20220425174313-0674425b8ef2
go.opentelemetry.io/collector v0.49.1-0.20220428142054-b34df3a7e7e9
go.opentelemetry.io/collector/pdata v0.49.1-0.20220428142054-b34df3a7e7e9
go.uber.org/zap v1.21.0
)

Expand Down
8 changes: 4 additions & 4 deletions exporter/awscloudwatchlogsexporter/go.sum
View file

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

4 changes: 2 additions & 2 deletions exporter/awsemfexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.49.0
github.com/stretchr/testify v1.7.1
go.opentelemetry.io/collector v0.49.1-0.20220425174313-0674425b8ef2
go.opentelemetry.io/collector/pdata v0.49.1-0.20220425174313-0674425b8ef2
go.opentelemetry.io/collector v0.49.1-0.20220428142054-b34df3a7e7e9
go.opentelemetry.io/collector/pdata v0.49.1-0.20220428142054-b34df3a7e7e9
go.opentelemetry.io/collector/semconv v0.0.0-20220422001137-87ab5de64ce4
go.uber.org/zap v1.21.0
google.golang.org/protobuf v1.28.0
Expand Down
8 changes: 4 additions & 4 deletions exporter/awsemfexporter/go.sum
View file

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
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.49.0
github.com/stretchr/testify v1.7.1
go.opentelemetry.io/collector v0.49.1-0.20220425174313-0674425b8ef2
go.opentelemetry.io/collector v0.49.1-0.20220428142054-b34df3a7e7e9
go.uber.org/zap v1.21.0
)

require (
github.com/gogo/protobuf v1.3.2
github.com/google/uuid v1.3.0
github.com/jaegertracing/jaeger v1.33.0
go.opentelemetry.io/collector/pdata v0.49.1-0.20220425174313-0674425b8ef2
go.opentelemetry.io/collector/pdata v0.49.1-0.20220428142054-b34df3a7e7e9
go.uber.org/multierr v1.8.0
)

Expand Down
8 changes: 4 additions & 4 deletions exporter/awskinesisexporter/go.sum
View file

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/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/aws/aws-sdk-go v1.44.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.49.0
github.com/stretchr/testify v1.7.1
go.opentelemetry.io/collector v0.49.1-0.20220425174313-0674425b8ef2
go.opentelemetry.io/collector v0.49.1-0.20220428142054-b34df3a7e7e9
)

require (
Expand Down Expand Up @@ -39,7 +39,7 @@ require (
github.com/tidwall/tinylru v1.1.0 // indirect
github.com/tidwall/wal v1.1.7 // indirect
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/collector/pdata v0.49.1-0.20220425174313-0674425b8ef2 // indirect
go.opentelemetry.io/collector/pdata v0.49.1-0.20220428142054-b34df3a7e7e9 // indirect
go.opentelemetry.io/collector/semconv v0.0.0-20220422001137-87ab5de64ce4 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.31.0 // indirect
go.opentelemetry.io/otel v1.6.3 // indirect
Expand Down
8 changes: 4 additions & 4 deletions exporter/awsprometheusremotewriteexporter/go.sum
View file

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
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.49.0
github.com/stretchr/testify v1.7.1
go.opentelemetry.io/collector v0.49.1-0.20220425174313-0674425b8ef2
go.opentelemetry.io/collector/pdata v0.49.1-0.20220425174313-0674425b8ef2
go.opentelemetry.io/collector v0.49.1-0.20220428142054-b34df3a7e7e9
go.opentelemetry.io/collector/pdata v0.49.1-0.20220428142054-b34df3a7e7e9
go.opentelemetry.io/collector/semconv v0.0.0-20220422001137-87ab5de64ce4
go.uber.org/zap v1.21.0
)
Expand Down
8 changes: 4 additions & 4 deletions exporter/awsxrayexporter/go.sum
View file

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
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ go 1.17
require (
github.com/microsoft/ApplicationInsights-Go v0.4.4
github.com/stretchr/testify v1.7.1
go.opentelemetry.io/collector v0.49.1-0.20220425174313-0674425b8ef2
go.opentelemetry.io/collector/pdata v0.49.1-0.20220425174313-0674425b8ef2
go.opentelemetry.io/collector v0.49.1-0.20220428142054-b34df3a7e7e9
go.opentelemetry.io/collector/pdata v0.49.1-0.20220428142054-b34df3a7e7e9
go.opentelemetry.io/collector/semconv v0.0.0-20220422001137-87ab5de64ce4
go.uber.org/zap v1.21.0
golang.org/x/net v0.0.0-20220225172249-27dd8689420f
Expand Down
Loading

0 comments on commit b9915f7

Please sign in to comment.