Skip to content
Merged
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
2 changes: 1 addition & 1 deletion internal/stats/metrics_recorder_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ type asyncRecorderWrapper struct {
// RecordIntAsync64Gauge records the measurement alongside labels on the int
// gauge associated with the provided handle.
func (w *asyncRecorderWrapper) RecordInt64AsyncGauge(handle *estats.Int64AsyncGaugeHandle, value int64, labels ...string) {
// Ensure only metrics for descriptors passed during callback registeration
// Ensure only metrics for descriptors passed during callback registration
// are emitted.
d := handle.Descriptor()
if _, ok := w.descriptors[d]; !ok {
Expand Down
4 changes: 2 additions & 2 deletions internal/xds/xdsdepmgr/xds_dependency_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ func (m *DependencyManager) maybeSendUpdateLocked() {
// []string: A slice of all "leaf" cluster names discovered in the
// traversal starting from `clusterName`. For
// non-aggregate clusters, this will contain only `clusterName`.
// error: Error that needs to be propogated up the tree (like
// error: Error that needs to be propagated up the tree (like
// max depth exceeded or an error propagated from a
// child cluster).
func (m *DependencyManager) populateClusterConfigLocked(clusterName string, depth int, clusterConfigs map[string]*xdsresource.ClusterResult, endpointResourcesSeen, dnsResourcesSeen, clustersSeen map[string]bool) (bool, []string, error) {
Expand Down Expand Up @@ -798,7 +798,7 @@ func (m *DependencyManager) onDNSError(resourceName string, err error) {
m.maybeSendUpdateLocked()
}

// RequestDNSReresolution calls all the the DNS resolver's ResolveNow.
// RequestDNSReresolution calls all the DNS resolver's ResolveNow.
func (m *DependencyManager) RequestDNSReresolution(opt resolver.ResolveNowOptions) {
m.mu.Lock()
defer m.mu.Unlock()
Expand Down
2 changes: 1 addition & 1 deletion internal/xds/xdsdepmgr/xds_dependency_manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1425,7 +1425,7 @@ func (s) TestAggregateClusterMaxDepth(t *testing.T) {
}
}

// Tests the scenrio where the Endpoint watcher receives an ambient error. Tests
// Tests the scenario where the Endpoint watcher receives an ambient error. Tests
// verifies that the error is stored in resolution note and the update remains
// too.
func (s) TestEndpointAmbientError(t *testing.T) {
Expand Down