Skip to content

Commit e3cd792

Browse files
johannaojelingFiery-Fenix
authored andcommitted
[cmd/opampsupervisor] Fix OpAMP Supervisor macOS example config (open-telemetry#39493)
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Fixes the macOS [example config](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/ec1e5061f599d47ec17c5e4783f60e9ea3a0d1e2/cmd/opampsupervisor/examples/supervisor_darwin.yaml) and makes it consistent with the Linux and Windows configs, so that the Supervisor can successfully connect to the [go-opamp server](https://github.com/open-telemetry/opamp-go/tree/d646431dacb432f56a84111bf94c9741692f53c0/internal/examples/server). <!-- Issue number (e.g. open-telemetry#1234) or full URL to issue, if applicable. --> #### Link to tracking issue Fixes open-telemetry#39492 <!--Describe what testing was performed and which tests were added.--> #### Testing 1. In [open-telemetry/opamp-go](https://github.com/open-telemetry/opamp-go): ``` cd internal/examples/server go run . ``` 2. In [open-telemetry/opentelemetry-collector-contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib): ``` make otelcontribcol cd cmd/opampsupervisor go run . --config examples/supervisor_darwin.yaml ``` <!--Please delete paragraphs that you did not use before submitting.-->
1 parent d10ab1c commit e3cd792

File tree

2 files changed

+28
-19
lines changed

2 files changed

+28
-19
lines changed
Lines changed: 27 additions & 0 deletions
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: bug_fix
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: fixes OpAMP Supervisor macOS example config
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: [39492]
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: []
Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
server:
2-
endpoint: ws://127.0.0.1:4320/v1/opamp
2+
endpoint: wss://127.0.0.1:4320/v1/opamp
33
tls:
44
# Disable verification to test locally.
55
# Don't do this in production.
66
insecure_skip_verify: true
77
# For more TLS settings see config/configtls.ClientConfig
8-
insecure: true
98

109
capabilities:
1110
reports_effective_config: true
@@ -21,20 +20,3 @@ agent:
2120

2221
storage:
2322
directory: .
24-
25-
telemetry:
26-
traces:
27-
processors:
28-
- simple:
29-
exporter:
30-
otlp:
31-
protocol: http/protobuf
32-
endpoint: http://localhost:4318
33-
logs:
34-
level: debug
35-
processors:
36-
- simple:
37-
exporter:
38-
otlp:
39-
protocol: http/protobuf
40-
endpoint: http://localhost:4318

0 commit comments

Comments
 (0)