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
4 changes: 4 additions & 0 deletions .chloggen/fix-aix-crash.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
change_type: bug_fix
component: pkg/service
note: "Don't error on startup when process metrics are enabled on unsupported OSes (e.g. AIX)"
issues: [14307]
20 changes: 20 additions & 0 deletions service/processmetrics_others.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

//go:build !linux && !windows && !darwin

package service // import "go.opentelemetry.io/collector/service"

import (
"runtime"

"go.uber.org/zap"
)

func registerProcessMetrics(srv *Service) error {
srv.telemetrySettings.Logger.Warn(
"Process metrics are disabled on this operating system",
zap.String("os", runtime.GOOS),
)
return nil
}
19 changes: 19 additions & 0 deletions service/processmetrics_valid.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

//go:build linux || windows || darwin

package service // import "go.opentelemetry.io/collector/service"

import (
"fmt"

"go.opentelemetry.io/collector/service/internal/proctelemetry"
)

func registerProcessMetrics(srv *Service) error {
if err := proctelemetry.RegisterProcessMetrics(srv.telemetrySettings); err != nil {
return fmt.Errorf("failed to register process metrics: %w", err)
}
return nil
}
7 changes: 4 additions & 3 deletions service/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
"go.opentelemetry.io/collector/service/internal/graph"
"go.opentelemetry.io/collector/service/internal/metricviews"
"go.opentelemetry.io/collector/service/internal/moduleinfo"
"go.opentelemetry.io/collector/service/internal/proctelemetry"
"go.opentelemetry.io/collector/service/internal/status"
"go.opentelemetry.io/collector/service/telemetry"
)
Expand Down Expand Up @@ -223,9 +222,11 @@ func New(ctx context.Context, set Settings, cfg Config) (_ *Service, resultErr e
return nil, err
}

if err := proctelemetry.RegisterProcessMetrics(srv.telemetrySettings); err != nil {
return nil, fmt.Errorf("failed to register process metrics: %w", err)
// Register process metrics (build-tagged per OS).
if err := registerProcessMetrics(srv); err != nil {
return nil, err
}

return srv, nil
}

Expand Down
Loading