Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[chore][cmd/mdatagen] fix #12298 unit tests failures #12415

Open
wants to merge 25 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
89976c9
fix
cuichenli Feb 7, 2025
f3eafb7
run generate
cuichenli Feb 7, 2025
6c75e14
fix
cuichenli Feb 7, 2025
6aa3e38
tab
cuichenli Feb 7, 2025
fea90c1
Merge branch 'main' into fix-mdatagen-internal-tests
cuichenli Feb 8, 2025
5933871
fmt
cuichenli Feb 10, 2025
39ff7d0
fix impi error
cuichenli Feb 10, 2025
7a85a77
fix wrong import
cuichenli Feb 10, 2025
7383af5
Merge branch 'main' into fix-mdatagen-internal-tests
cuichenli Feb 11, 2025
abf9932
update on comment
cuichenli Feb 11, 2025
e798f61
Merge branch 'main' into fix-mdatagen-internal-tests
cuichenli Feb 11, 2025
dadbba8
Merge branch 'main' into fix-mdatagen-internal-tests
cuichenli Feb 12, 2025
87a372e
Merge branch 'main' into fix-mdatagen-internal-tests
cuichenli Feb 12, 2025
73d34a2
Merge branch 'main' into fix-mdatagen-internal-tests
cuichenli Feb 13, 2025
0a059eb
Merge branch 'main' into fix-mdatagen-internal-tests
cuichenli Feb 14, 2025
f4b4bfe
Merge branch 'main' into fix-mdatagen-internal-tests
cuichenli Feb 15, 2025
0369f57
Merge branch 'main' into fix-mdatagen-internal-tests
cuichenli Feb 17, 2025
995e3b2
Merge branch 'main' into fix-mdatagen-internal-tests
cuichenli Feb 17, 2025
1eb8460
Merge branch 'main' into fix-mdatagen-internal-tests
mx-psi Feb 17, 2025
8b29a24
Merge branch 'main' into fix-mdatagen-internal-tests
cuichenli Feb 18, 2025
86033c8
Merge branch 'main' into fix-mdatagen-internal-tests
dmitryax Feb 18, 2025
235ae9d
Merge branch 'main' into fix-mdatagen-internal-tests
bogdandrutu Feb 18, 2025
6ce5460
Merge branch 'main' into fix-mdatagen-internal-tests
cuichenli Feb 19, 2025
60efb2b
Merge branch 'main' into fix-mdatagen-internal-tests
bogdandrutu Feb 21, 2025
f22ea62
Merge branch 'main' into fix-mdatagen-internal-tests
bogdandrutu Feb 21, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/mdatagen/internal/loader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ func TestLoadMetadata(t *testing.T) {
},
},
},
ScopeName: "go.opentelemetry.io/collector/internal/receiver/samplereceiver",
ScopeName: "go.opentelemetry.io/collector/cmd/mdatagen/internal/samplereceiver",
ShortFolderName: "sample",
Tests: Tests{Host: "componenttest.NewNopHost()"},
},
Expand Down

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.

2 changes: 1 addition & 1 deletion cmd/mdatagen/internal/samplereceiver/metadata.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Sample metadata file with all available configurations for a receiver.

type: sample
scope_name: go.opentelemetry.io/collector/internal/receiver/samplereceiver
scope_name: go.opentelemetry.io/collector/cmd/mdatagen/internal/samplereceiver
github_project: open-telemetry/opentelemetry-collector

sem_conv_version: 1.9.0
Expand Down
1 change: 0 additions & 1 deletion cmd/mdatagen/internal/templates/component_test.go.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import (
"go.opentelemetry.io/collector/receiver/receivertest"
{{- end }}
{{- if isScraper }}
"go.opentelemetry.io/collector/consumer/consumertest"
"go.opentelemetry.io/collector/scraper"
"go.opentelemetry.io/collector/scraper/scrapertest"
{{- end }}
Expand Down
1 change: 0 additions & 1 deletion cmd/mdatagen/internal/templates/telemetrytest.go.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
package {{ .Package }}test

import (
"context"
"testing"

"github.com/stretchr/testify/require"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
package {{ .Package }}test

import (
"context"
"context"
"testing"

"github.com/stretchr/testify/require"
"go.opentelemetry.io/otel/metric"
"go.opentelemetry.io/otel/sdk/metric/metricdata"
"go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest"

Expand Down
Loading