Skip to content

Commit d1f0321

Browse files
bacherflevan-bradley
bacherfl
and
evan-bradley
authored
[opampsupervisor] add telemetry settings to the opamp supervisor (#38017)
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description This PR adds options to configure the telemetry settings for the OpAmp supervisor. This will enable the supervisor, in addition to logging, export metrics and traces as well. For the sake of consistency, I also moved the logger of the supervisor into the telemetrySettings property of the supervisor. This PR does not add any traces or metrics yet, but just provides the groundwork to add those later on. <!-- Issue number (e.g. #1234) or full URL to issue, if applicable. --> #### Link to tracking issue Fixes #35582 <!--Describe what testing was performed and which tests were added.--> #### Testing Added Unit tests. E2E test can be added once we start emitting traces and metrics. --------- Signed-off-by: Florian Bacher <[email protected]> Co-authored-by: Evan Bradley <[email protected]>
1 parent d678dd7 commit d1f0321

File tree

6 files changed

+523
-119
lines changed

6 files changed

+523
-119
lines changed

‎.chloggen/supervisor-telemetey-settings.yaml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: opampsupervisor
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Allow configuring additional telemetry settings for the Supervisor's own telemetry
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [35582]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: []

‎cmd/opampsupervisor/go.mod

+47-1
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,75 @@ require (
1212
github.com/knadh/koanf/v2 v2.1.2
1313
github.com/open-telemetry/opamp-go v0.19.0
1414
github.com/stretchr/testify v1.10.0
15+
go.opentelemetry.io/collector/component v0.120.1-0.20250303102058-a9bca17f1a4c
1516
go.opentelemetry.io/collector/config/configopaque v1.26.1-0.20250303102058-a9bca17f1a4c
17+
go.opentelemetry.io/collector/config/configtelemetry v0.120.1-0.20250303102058-a9bca17f1a4c
1618
go.opentelemetry.io/collector/config/configtls v1.26.1-0.20250303102058-a9bca17f1a4c
1719
go.opentelemetry.io/collector/confmap v1.26.1-0.20250303102058-a9bca17f1a4c
1820
go.opentelemetry.io/collector/confmap/provider/envprovider v1.26.1-0.20250303102058-a9bca17f1a4c
1921
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.26.1-0.20250303102058-a9bca17f1a4c
22+
go.opentelemetry.io/collector/pdata v1.26.1-0.20250303102058-a9bca17f1a4c
2023
go.opentelemetry.io/collector/semconv v0.120.1-0.20250303102058-a9bca17f1a4c
24+
go.opentelemetry.io/collector/service v0.120.1-0.20250303102058-a9bca17f1a4c
25+
go.opentelemetry.io/contrib/config v0.14.0
2126
go.uber.org/goleak v1.3.0
27+
go.uber.org/multierr v1.11.0
2228
go.uber.org/zap v1.27.0
2329
golang.org/x/sys v0.30.0
2430
google.golang.org/protobuf v1.36.5
2531
gopkg.in/yaml.v3 v3.0.1
2632
)
2733

2834
require (
35+
github.com/beorn7/perks v1.0.1 // indirect
36+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2937
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3038
github.com/fsnotify/fsnotify v1.8.0 // indirect
39+
github.com/go-logr/logr v1.4.2 // indirect
40+
github.com/go-logr/stdr v1.2.2 // indirect
3141
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
42+
github.com/gogo/protobuf v1.3.2 // indirect
3243
github.com/gorilla/websocket v1.5.3 // indirect
44+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
45+
github.com/hashicorp/go-version v1.7.0 // indirect
46+
github.com/klauspost/compress v1.18.0 // indirect
3347
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
3448
github.com/mitchellh/copystructure v1.2.0 // indirect
3549
github.com/mitchellh/reflectwalk v1.0.2 // indirect
50+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3651
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
37-
go.uber.org/multierr v1.11.0 // indirect
52+
github.com/prometheus/client_golang v1.20.5 // indirect
53+
github.com/prometheus/client_model v0.6.1 // indirect
54+
github.com/prometheus/common v0.62.0 // indirect
55+
github.com/prometheus/procfs v0.15.1 // indirect
56+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
57+
go.opentelemetry.io/collector/featuregate v1.26.1-0.20250303102058-a9bca17f1a4c // indirect
58+
go.opentelemetry.io/contrib/bridges/otelzap v0.9.0 // indirect
59+
go.opentelemetry.io/contrib/propagators/b3 v1.34.0 // indirect
60+
go.opentelemetry.io/otel v1.34.0 // indirect
61+
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.10.0 // indirect
62+
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.10.0 // indirect
63+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.34.0 // indirect
64+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.34.0 // indirect
65+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
66+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
67+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.34.0 // indirect
68+
go.opentelemetry.io/otel/exporters/prometheus v0.56.0 // indirect
69+
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.10.0 // indirect
70+
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.34.0 // indirect
71+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.34.0 // indirect
72+
go.opentelemetry.io/otel/log v0.10.0 // indirect
73+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
74+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
75+
go.opentelemetry.io/otel/sdk/log v0.10.0 // indirect
76+
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
77+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
78+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
79+
golang.org/x/net v0.35.0 // indirect
80+
golang.org/x/text v0.22.0 // indirect
81+
google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect
82+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
83+
google.golang.org/grpc v1.70.0 // indirect
3884
)
3985

4086
replace go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c

0 commit comments

Comments
 (0)