#19908

Committed 16 Jul 2025 07:54PM UTC coverage: 88.593% (+0.07%) from 88.528%

Build # #19908

Build Type

push

github

Committed by

ejona86

Commit Message

Revert "xds: Convert CdsLb to XdsDepManager"

This reverts commit 297ab05ef.

b/430347751 shows multiple concerning behaviors in the xDS stack with
the new A74 config update model. XdsDepManager and CdsLB2 still seem to
be working correctly, but the change is exacerbated issues in other
parts of the stack, like RingHashConfig not having equals fixed in
a8de9f07ab.

Revert only for the v1.74.x release, leaving it on master.

Run Details

34647 of 39108 relevant lines covered (88.59%)

0.89 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

/../xds/src/main/java/io/grpc/xds/client/XdsClientMetricReporter.java

/*
 * Copyright 2024 The gRPC Authors
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package io.grpc.xds.client;

import io.grpc.Internal;

/**
 * Interface for reporting metrics from the xDS client.
 */
@Internal
public interface XdsClientMetricReporter {

  /**
   * Reports number of valid and invalid resources.
   *
   * @param validResourceCount Number of resources that were valid.
   * @param invalidResourceCount Number of resources that were invalid.
   * @param xdsServer Target URI of the xDS server with which the XdsClient is communicating.
   * @param resourceType Type of XDS resource (e.g., "envoy.config.listener.v3.Listener").
   */
  default void reportResourceUpdates(long validResourceCount, long invalidResourceCount,
      String xdsServer, String resourceType) {
  }

  /**
   * Reports number of xDS servers going from healthy to unhealthy.
   *
   * @param serverFailure Number of xDS server failures.
   * @param xdsServer Target URI of the xDS server with which the XdsClient is communicating.
   */
  default void reportServerFailure(long serverFailure, String xdsServer) {
  }

}

1	/*
2	* Copyright 2024 The gRPC Authors
3	*
4	* Licensed under the Apache License, Version 2.0 (the "License");
5	* you may not use this file except in compliance with the License.
6	* You may obtain a copy of the License at
7	*
8	* http://www.apache.org/licenses/LICENSE-2.0
9	*
10	* Unless required by applicable law or agreed to in writing, software
11	* distributed under the License is distributed on an "AS IS" BASIS,
12	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13	* See the License for the specific language governing permissions and
14	* limitations under the License.
15	*/
16
17	package io.grpc.xds.client;
18
19	import io.grpc.Internal;
20
21	/**
22	* Interface for reporting metrics from the xDS client.
23	*/
24	@Internal
25	public interface XdsClientMetricReporter {
26
27	/**
28	* Reports number of valid and invalid resources.
29	*
30	* @param validResourceCount Number of resources that were valid.
31	* @param invalidResourceCount Number of resources that were invalid.
32	* @param xdsServer Target URI of the xDS server with which the XdsClient is communicating.
33	* @param resourceType Type of XDS resource (e.g., "envoy.config.listener.v3.Listener").
34	*/
35	default void reportResourceUpdates(long validResourceCount, long invalidResourceCount,
36	String xdsServer, String resourceType) {
37	}	×
38
39	/**
40	* Reports number of xDS servers going from healthy to unhealthy.
41	*
42	* @param serverFailure Number of xDS server failures.
43	* @param xdsServer Target URI of the xDS server with which the XdsClient is communicating.
44	*/
45	default void reportServerFailure(long serverFailure, String xdsServer) {
46	}	×
47
48	}

grpc / grpc-java / #19908

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous