1
0
mirror of https://github.com/open-telemetry/opentelemetry-go.git synced 2026-06-03 18:35:08 +02:00

Fix receiver-naming issues from revive (#8093)

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
This commit is contained in:
Matthieu MOREL
2026-05-22 09:01:15 +02:00
committed by GitHub
parent 6ceeae804a
commit f6c8baa895
7 changed files with 63 additions and 52 deletions
+8 -5
View File
@@ -7,9 +7,9 @@ package decls // import "go.opentelemetry.io/otel/internal/tools/semconvkit/decl
import (
"go/ast"
"go/parser"
"go/token"
"strings"
"golang.org/x/tools/go/packages"
)
// GetNames parses the Go source code in the specified package path and returns
@@ -20,15 +20,18 @@ import (
// lowercased form of the name and the values are the original format of the
// name.
func GetNames(pkgPath string, f Parser) (Names, error) {
fset := token.NewFileSet()
pkgs, err := parser.ParseDir(fset, pkgPath, nil, 0)
cfg := &packages.Config{
Mode: packages.NeedSyntax | packages.NeedFiles,
Dir: pkgPath,
}
pkgs, err := packages.Load(cfg, ".")
if err != nil {
return nil, err
}
out := make(Names)
for _, pkg := range pkgs {
for _, file := range pkg.Files {
for _, file := range pkg.Syntax {
for _, decl := range file.Decls {
for _, name := range f(decl) {
out[NewCanonicalName(name)] = Name(name)
+1 -1
View File
@@ -197,7 +197,7 @@ type SemanticConventions struct {
TagVer string
}
func (sc SemanticConventions) SemVer() string {
func (SemanticConventions) SemVer() string {
return strings.TrimPrefix(*tag, "v")
}
+14 -10
View File
@@ -6,6 +6,7 @@
package main
import (
"errors"
"fmt"
"io/fs"
"os"
@@ -23,13 +24,13 @@ var excludedDirs = []string{
const readmeFilename = "README.md"
// verifyReadme is a [os.WalkFunc] that checks if a README.md exists in the same directory as the go.mod file.
func verifyReadme(path string, info os.FileInfo, err error) error {
// verifyReadme is a [fs.WalkDirFunc] that checks if a README.md exists in the same directory as the go.mod file.
func verifyReadme(path string, d fs.DirEntry, err error) error {
if err != nil {
return err
}
if !info.Mode().IsRegular() || info.Name() != "go.mod" {
if !d.Type().IsRegular() || d.Name() != "go.mod" {
return nil
}
@@ -43,7 +44,7 @@ func verifyReadme(path string, info os.FileInfo, err error) error {
readme := filepath.Join(filepath.Dir(path), readmeFilename)
_, err = os.Stat(readme)
if os.IsNotExist(err) {
err = fmt.Errorf("couldn't find %s for %q", readmeFilename, filepath.Dir(path))
return fmt.Errorf("couldn't find %s for %q", readmeFilename, filepath.Dir(path))
}
return err
@@ -60,19 +61,22 @@ func main() {
os.Exit(1)
}
// Clean the path to prevent path traversal issues
root = filepath.Clean(root)
fmt.Println("Verifying READMEs in", root)
var errs []string
filepath.Walk(root, func(path string, info fs.FileInfo, err error) error {
if err := verifyReadme(path, info, err); err != nil {
errs = append(errs, err.Error())
var errs []error
_ = filepath.WalkDir(root, func(path string, d fs.DirEntry, err error) error {
if err := verifyReadme(path, d, err); err != nil {
errs = append(errs, err)
}
return nil // continue walking
})
if len(errs) > 0 {
if err := errors.Join(errs...); err != nil {
fmt.Println("Some readme files couldn't be found.")
fmt.Println(strings.Join(errs, "\n"))
fmt.Println(err.Error())
os.Exit(1)
}
}