Skip to content

Commit

Permalink
[chore] update mdatagen (#32499)
Browse files Browse the repository at this point in the history
This PR pulls in the latest mdatagen that auto-generates goleak package
tests. There are still some issues to sort out before being able to use
it, but it's mostly there.

I've found a few more modules where goleak can be enabled with no
additional tests so i've done so as part of this PR

Fixes #30483

---------

Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com>
  • Loading branch information
codeboten authored Apr 22, 2024
1 parent ce2d146 commit 78b852c
Show file tree
Hide file tree
Showing 294 changed files with 1,002 additions and 685 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ docker-telemetrygen:
generate: install-tools
cd ./internal/tools && go install go.opentelemetry.io/collector/cmd/mdatagen
$(MAKE) for-all CMD="$(GOCMD) generate ./..."
$(MAKE) gofmt

.PHONY: githubgen-install
githubgen-install:
Expand Down

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

11 changes: 11 additions & 0 deletions connector/datadogconnector/generated_package_test.go

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

2 changes: 2 additions & 0 deletions connector/datadogconnector/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ status:
emeritus: [gbbr]

tests:
goleak:
skip: true

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

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

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

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

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

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

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

11 changes: 11 additions & 0 deletions exporter/alibabacloudlogserviceexporter/generated_package_test.go

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

4 changes: 3 additions & 1 deletion exporter/alibabacloudlogserviceexporter/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@ tests:
config:
endpoint: "http://localhost:0"
project: "otel-testing"
logstore: "otel-data"
logstore: "otel-data"
goleak:
skip: true
13 changes: 13 additions & 0 deletions exporter/awscloudwatchlogsexporter/generated_package_test.go

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

5 changes: 5 additions & 0 deletions exporter/awscloudwatchlogsexporter/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,8 @@ tests:
retry_on_failure:
enabled: false
expect_consumer_error: true
goleak:
ignore:
top:
# See https://github.com/census-instrumentation/opencensus-go/issues/1191 for more information.
- "go.opencensus.io/stats/view.(*worker).start"
17 changes: 0 additions & 17 deletions exporter/awscloudwatchlogsexporter/package_test.go

This file was deleted.

11 changes: 11 additions & 0 deletions exporter/awsemfexporter/generated_package_test.go

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

4 changes: 3 additions & 1 deletion exporter/awsemfexporter/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,6 @@ tests:
region: 'us-west-2'
resource_to_telemetry_conversion:
enabled: true
expect_consumer_error: true
expect_consumer_error: true
goleak:
skip: true

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

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

1 change: 1 addition & 0 deletions exporter/awss3exporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ require (
go.opentelemetry.io/collector/pdata v1.5.1-0.20240419202408-d1e631b61158
go.opentelemetry.io/otel/metric v1.25.0
go.opentelemetry.io/otel/trace v1.25.0
go.uber.org/goleak v1.3.0
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.27.0
)
Expand Down
11 changes: 11 additions & 0 deletions exporter/awsxrayexporter/generated_package_test.go

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

4 changes: 3 additions & 1 deletion exporter/awsxrayexporter/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,6 @@ status:
tests:
config:
region: 'us-west-2'
expect_consumer_error: true
expect_consumer_error: true
goleak:
skip: true
13 changes: 13 additions & 0 deletions exporter/azuredataexplorerexporter/generated_package_test.go

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

7 changes: 6 additions & 1 deletion exporter/azuredataexplorerexporter/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,9 @@ tests:
application_id: "f80da32c-108c-415c-a19e-643f461a677a"
application_key: "xx-xx-xx-xx"
tenant_id: "21ff9e36-fbaa-43c8-98ba-00431ea10bc3"
skip_lifecycle: true
skip_lifecycle: true
goleak:
ignore:
top:
# See https://github.com/census-instrumentation/opencensus-go/issues/1191 for more information.
- "go.opencensus.io/stats/view.(*worker).start"
17 changes: 0 additions & 17 deletions exporter/azuredataexplorerexporter/package_test.go

This file was deleted.

11 changes: 11 additions & 0 deletions exporter/azuremonitorexporter/generated_package_test.go

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

4 changes: 3 additions & 1 deletion exporter/azuremonitorexporter/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@ tests:
config:
connection_string: "InstrumentationKey=00000000-0000-0000-0000-000000000000;IngestionEndpoint=https://ingestion.azuremonitor.com/"
instrumentation_key: b1cd0778-85fc-4677-a3fa-79d3c23e0efd
expect_consumer_error: true
expect_consumer_error: true
goleak:
skip: true

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

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

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

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

12 changes: 12 additions & 0 deletions exporter/datadogexporter/generated_package_test.go

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

5 changes: 4 additions & 1 deletion exporter/datadogexporter/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,7 @@ tests:
enabled: false
retry_on_failure:
enabled: false
expect_consumer_error: true
expect_consumer_error: true
goleak:
setup: "setupTestMain(m)"
skip: true
2 changes: 1 addition & 1 deletion exporter/datadogexporter/traces_exporter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter/internal/testutil"
)

func TestMain(m *testing.M) {
func setupTestMain(m *testing.M) {
tracelog.SetLogger(&testlogger{})
os.Exit(m.Run())
}
Expand Down
11 changes: 11 additions & 0 deletions exporter/datasetexporter/generated_package_test.go

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

2 changes: 2 additions & 0 deletions exporter/datasetexporter/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ tests:
dataset_url: https://app.scalyr.com
api_key: key-minimal
skip_lifecycle: true
goleak:
skip: true

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

13 changes: 13 additions & 0 deletions exporter/fileexporter/generated_package_test.go

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

7 changes: 6 additions & 1 deletion exporter/fileexporter/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,9 @@ status:
tests:
config:
path: testdata/log.json
expect_consumer_error: true
expect_consumer_error: true
goleak:
ignore:
top:
# Existing issue for leak: https://github.com/natefinch/lumberjack/issues/56
- "gopkg.in/natefinch/lumberjack%2ev2.(*Logger).millRun"
Loading

0 comments on commit 78b852c

Please sign in to comment.