Merge branch 'introduce-heartbeats' of github.com:jaronoff97/opamp-sp…

…ec into introduce-heartbeats
open-telemetry · May 8, 2024 · b24c948 · b24c948
2 parents 2ae4799 + 7cb4ecc
commit b24c948
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/proto/opamp.proto b/proto/opamp.proto
@@ -271,7 +271,7 @@ message OpAMPConnectionSettings {
     //
     // A Polling-based HTTP Client MUST use the value as polling interval.
     //
-    // A heartbeat is used to keep a load balancer connection active AND inform the server that the Agent
+    // A heartbeat is used to keep a load balancer connection active and inform the server that the Agent
     // is still alive and active.
     //
     // This field is optional:

diff --git a/specification.md b/specification.md
@@ -1867,7 +1867,7 @@ message. At a minimum the instance_uid field MUST be set. It is recommended that
 also set ComponentHealth as well. An HTTP based-client MUST use the heartbeat interval as
 its polling interval.
 
-A heartbeat is used to keep a load balancer connection active AND inform the server that
+A heartbeat is used to keep a load balancer connection active and inform the server that
 the Agent is still alive and active. A server could use the heartbeat to make decisions about
 the liveness of the connected Agent.