Skip to content

Commit

Permalink
Merge branch 'main' of github.com:open-telemetry/opamp-spec into intr…
Browse files Browse the repository at this point in the history
…oduce-heartbeats
  • Loading branch information
jaronoff97 committed Jun 24, 2024
2 parents ac174a7 + 9265224 commit 3c92d98
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion proto/opamp.proto
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ message AgentDescription {
// Agent type, e.g. "io.opentelemetry.collector"
// - service.namespace if it is used in the environment where the Agent runs.
// - service.version should be set to version number of the Agent build.
// - service.instance.id should be set. It may be be set equal to the Agent's
// - service.instance.id should be set. It may be set equal to the Agent's
// instance uid (equal to ServerToAgent.instance_uid field) or any other value
// that uniquely identifies the Agent in combination with other attributes.
// - any other attributes that are necessary for uniquely identifying the Agent's
Expand Down
6 changes: 3 additions & 3 deletions specification.md
Original file line number Diff line number Diff line change
Expand Up @@ -1119,7 +1119,7 @@ attributes SHOULD be specified:
- service.name should be set to the same value that the Agent uses in its own telemetry.
- service.namespace if it is used in the environment where the Agent runs.
- service.version should be set to version number of the Agent build.
- service.instance.id should be set. It may be be set equal to the Agent's
- service.instance.id should be set. It may be set equal to the Agent's
instance uid (equal to ServerToAgent.instance_uid field) or any other value
that uniquely identifies the Agent in combination with other attributes.
- any other attributes that are necessary for uniquely identifying the Agent's
Expand Down Expand Up @@ -3161,9 +3161,9 @@ reduce the number of connections to the Server when a very large number
### Agent Management

* Splunk
[Deployment Server](https://docs.splunk.com/Documentation/Splunk/8.2.2/Updating/Aboutdeploymentserver)
[Deployment Server](https://docs.splunk.com/Documentation/Splunk/latest/Updating/Aboutdeploymentserver)
* Centralized Configuration of vRealize
[Log Insight Agents](https://docs.vmware.com/en/vRealize-Log-Insight/8.4/com.vmware.log-insight.agent.admin.doc/GUID-40C13E10-1554-4F1B-B832-69CEBF85E7A0.html)
[Log Insight Agents](https://docs.vmware.com/en/vRealize-Log-Insight/8.10/com.vmware.log-insight.agent.admin.doc/GUID-40C13E10-1554-4F1B-B832-69CEBF85E7A0.html)
* Google Cloud
[Guest Agent](https://github.com/GoogleCloudPlatform/guest-agent) uses HTTP
[long polling](https://cloud.google.com/compute/docs/metadata/querying-metadata#waitforchange)
Expand Down

0 comments on commit 3c92d98

Please sign in to comment.