master pull

Author: AgraVator

core/src/main/java/io/grpc/internal/InternalSubchannel.java

@@ -588,6 +588,8 @@ public Attributes filterTransport(Attributes attributes) {
     @Override
     public void transportReady() {
       channelLogger.log(ChannelLogLevel.INFO, "READY");
+      subchannelMetrics.recordConnectionAttemptSucceeded(
+          buildLabelSet(null, extractSecurityLevel()));
       syncContext.execute(new Runnable() {
         @Override
         public void run() {
@@ -624,6 +626,7 @@ public void transportShutdown(final Status s) {
       channelLogger.log(
           ChannelLogLevel.INFO, "{0} SHUTDOWN with {1}", transport.getLogId(), printShortStatus(s));
       shutdownInitiated = true;
+      subchannelMetrics.recordConnectionAttemptFailed(buildLabelSet("Peer Pressure", null));
       syncContext.execute(new Runnable() {
         @Override
         public void run() {
@@ -678,6 +681,8 @@ public void transportTerminated() {
       for (ClientTransportFilter filter : transportFilters) {
         filter.transportTerminated(transport.getAttributes());
       }
+      subchannelMetrics.recordDisconnection(buildLabelSet("Peer Pressure",
+          null));
       syncContext.execute(new Runnable() {
         @Override
         public void run() {
@@ -868,6 +873,17 @@ private String printShortStatus(Status status) {
     return buffer.toString();
   }
 
+  private OtelMetricsAttributes buildLabelSet(String disconnectError, String secLevel) {
+    return new OtelMetricsAttributes(
+        target,
+        backendService,
+        locality,
+        disconnectError,
+        secLevel != null ? secLevel : securityLevel
+    );
+  }
+
+
   @VisibleForTesting
   static final class TransportLogger extends ChannelLogger {
     // Changed just after construction to break a cyclic dependency.

core/src/main/java/io/grpc/internal/OtelMetricsAttributes.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2025 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.internal;
+
+
+import io.grpc.Attributes;
+
+class OtelMetricsAttributes {
+  final String target;
+  final String backendService;
+  final String locality;
+  final String disconnectError;
+  final String securityLevel;
+
+  public OtelMetricsAttributes(String target, String backendService, String locality,
+                               String disconnectError, String securityLevel) {
+    this.target = target;
+    this.backendService = backendService;
+    this.locality = locality;
+    this.disconnectError = disconnectError;
+    this.securityLevel = securityLevel;
+  }
+
+  public Attributes toOtelMetricsAttributes() {
+    Attributes attributes =
+        Attributes.EMPTY;
+
+    if (target != null) {
+      attributes.toBuilder()
+          .set(Attributes.Key.create("grpc.target"), target)
+          .build();
+    }
+    if (backendService != null) {
+      attributes.toBuilder()
+          .set(Attributes.Key.create("grpc.lb.backend_service"), backendService)
+          .build();
+    }
+    if (locality != null) {
+      attributes.toBuilder()
+          .set(Attributes.Key.create("grpc.lb.locality"), locality)
+          .build();
+    }
+    if (disconnectError != null) {
+      attributes.toBuilder()
+          .set(Attributes.Key.create("grpc.disconnect_error"), disconnectError)
+          .build();
+    }
+    if (securityLevel != null) {
+      attributes.toBuilder()
+          .set(Attributes.Key.create("grpc.security_level"), securityLevel)
+          .build();
+    }
+    return attributes;
+  }
+}