Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
### Fixed

- Prevent a panic in `NewFixedSizeReservoir` and `FixedSizeReservoirProvider` when given a negative size in `go.opentelemetry.io/otel/sdk/metric/exemplar`; negative sizes are now clamped to zero, consistent with a size of zero. (#8832)
- Ensure metric helpers in `go.opentelemetry.io/otel/semconv/v1.32.0`, `go.opentelemetry.io/otel/semconv/v1.33.0`, and `go.opentelemetry.io/otel/semconv/v1.34.0` record measurements only once when no attributes are provided. (#8849)

<!-- Released section -->
<!-- Don't change this section unless doing release -->
Expand Down
82 changes: 82 additions & 0 deletions internal/tools/semconvkit/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ package main

import (
"bytes"
"go/ast"
"go/parser"
"go/token"
"os"
"path/filepath"
"strings"
Expand Down Expand Up @@ -94,6 +97,85 @@ func TestNoInvalidObservableHistogramTypes(t *testing.T) {
}
}

// TestGeneratedMetricHelpersReturnAfterEmptyAttrs checks every retained helper
// affected by the missing return in semconv v1.32.0 through v1.34.0.
func TestGeneratedMetricHelpersReturnAfterEmptyAttrs(t *testing.T) {
t.Parallel()

packages := map[string][]string{
"containerconv": {"Uptime"},
"goconv": {"ScheduleDuration"},
"k8sconv": {"NodeCPUUsage", "NodeMemoryUsage", "NodeUptime", "PodCPUUsage", "PodMemoryUsage", "PodUptime"},
"processconv": {"Uptime"},
"rpcconv": {"ClientDuration", "ClientRequestSize", "ClientRequestsPerRPC", "ClientResponseSize", "ClientResponsesPerRPC", "ServerDuration", "ServerRequestSize", "ServerRequestsPerRPC", "ServerResponseSize", "ServerResponsesPerRPC"},
"systemconv": {"Uptime"},
}
versions := []string{"v1.32.0", "v1.33.0", "v1.34.0"}
fset := token.NewFileSet()

for _, version := range versions {
for pkg, functions := range packages {
path := filepath.Join("..", "..", "..", "semconv", version, pkg, "metric.go")
file, err := parser.ParseFile(fset, path, nil, 0)
if err != nil {
t.Fatalf("ParseFile(%q) error = %v", path, err)
}

for _, function := range functions {
matches := 0
ast.Inspect(file, func(node ast.Node) bool {
fn, ok := node.(*ast.FuncDecl)
if !ok || fn.Recv == nil || fn.Name.Name != "Record" {
return true
}
if len(fn.Recv.List) != 1 || len(fn.Recv.List[0].Names) != 1 || fn.Recv.List[0].Names[0].Name != "m" {
return true
}
receiver, ok := fn.Recv.List[0].Type.(*ast.Ident)
if !ok || receiver.Name != function {
return true
}

fastPaths := 0
ast.Inspect(fn.Body, func(node ast.Node) bool {
ifStmt, ok := node.(*ast.IfStmt)
if !ok {
return true
}
condition, ok := ifStmt.Cond.(*ast.BinaryExpr)
if !ok || condition.Op != token.EQL {
return true
}
call, ok := condition.X.(*ast.CallExpr)
zero, zeroOK := condition.Y.(*ast.BasicLit)
if !ok || !zeroOK || zero.Kind != token.INT || zero.Value != "0" || len(call.Args) != 1 {
return true
}
fn, fnOK := call.Fun.(*ast.Ident)
arg, argOK := call.Args[0].(*ast.Ident)
if !fnOK || !argOK || fn.Name != "len" || arg.Name != "attrs" {
return true
}
if len(ifStmt.Body.List) > 0 {
if _, ok := ifStmt.Body.List[len(ifStmt.Body.List)-1].(*ast.ReturnStmt); ok {
fastPaths++
}
}
return true
})
if fastPaths == 1 {
matches++
}
return false
})
if matches != 1 {
t.Errorf("%s: %s.Record empty-attrs fast paths = %d, want 1", path, function, matches)
}
}
}
}
}

func writeGoFile(t *testing.T, dir, _, src string) {
t.Helper()

Expand Down
1 change: 1 addition & 0 deletions semconv/v1.32.0/containerconv/metric.go

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

1 change: 1 addition & 0 deletions semconv/v1.32.0/goconv/metric.go

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

6 changes: 6 additions & 0 deletions semconv/v1.32.0/k8sconv/metric.go

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

1 change: 1 addition & 0 deletions semconv/v1.32.0/processconv/metric.go

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

10 changes: 10 additions & 0 deletions semconv/v1.32.0/rpcconv/metric.go

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

1 change: 1 addition & 0 deletions semconv/v1.32.0/systemconv/metric.go

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

1 change: 1 addition & 0 deletions semconv/v1.33.0/containerconv/metric.go

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

1 change: 1 addition & 0 deletions semconv/v1.33.0/goconv/metric.go

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

6 changes: 6 additions & 0 deletions semconv/v1.33.0/k8sconv/metric.go

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

1 change: 1 addition & 0 deletions semconv/v1.33.0/processconv/metric.go

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

Loading
Loading