Skip to content

fix(otel): align service resource schema #2442

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.

Sign up for GitHub

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

Open
pandego wants to merge 3 commits into
base: main
Choose a base branch
from
+23 −9
Open

fix(otel): align service resource schema #2442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fad2fb1
fix(otel): align service resource schema
pandego Apr 15, 2026
952f5c7
test: fix otel import ordering
pandego Apr 17, 2026
067b100
fix(otel): move localhost helper comment
pandego Apr 17, 2026
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
22 changes: 13 additions & 9 deletions cmd/root/otel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,14 @@ import (
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp"
"go.opentelemetry.io/otel/sdk/resource"
"go.opentelemetry.io/otel/sdk/trace"
semconv "go.opentelemetry.io/otel/semconv/v1.37.0"
semconv "go.opentelemetry.io/otel/semconv/v1.40.0"
Comment thread
pandego marked this conversation as resolved.
)

const AppName = "cagent"

// initOTelSDK initializes OpenTelemetry SDK with OTLP exporter
func initOTelSDK(ctx context.Context) (err error) {
res, err := resource.Merge(
resource.Default(),
resource.NewWithAttributes(
semconv.SchemaURL,
semconv.ServiceName(AppName),
semconv.ServiceVersion("dev"), // TODO: use actual version
),
)
res, err := newOTelResource()
if err != nil {
return fmt.Errorf("failed to create resource: %w", err)
}
Expand Down Expand Up @@ -75,6 +68,17 @@ func initOTelSDK(ctx context.Context) (err error) {
return nil
}

func newOTelResource() (*resource.Resource, error) {
return resource.Merge(
resource.Default(),
resource.NewWithAttributes(
semconv.SchemaURL,
semconv.ServiceName(AppName),
semconv.ServiceVersion("dev"), // TODO: use actual version
),
)
}

// isLocalhostEndpoint reports whether the given endpoint refers to a
// loopback address so that we can safely skip TLS.
func isLocalhostEndpoint(endpoint string) bool {
Expand Down
10 changes: 10 additions & 0 deletions cmd/root/otel_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,18 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
semconv "go.opentelemetry.io/otel/semconv/v1.40.0"
)

func TestNewOTelResourceUsesCurrentSchemaURL(t *testing.T) {
t.Parallel()

res, err := newOTelResource()
require.NoError(t, err)
assert.Equal(t, semconv.SchemaURL, res.SchemaURL())
}

func TestIsLocalhostEndpoint(t *testing.T) {
t.Parallel()

Expand Down
Loading