Skip to content

Commit db88922

Browse files
committed
Update connection opening failed metric when @onopen throws
Fixes: #47409
1 parent 71c9959 commit db88922

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed

extensions/websockets-next/deployment/src/test/java/io/quarkus/websockets/next/test/telemetry/MetricsAsserter.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import static io.quarkus.websockets.next.runtime.telemetry.TelemetryConstants.CLIENT_ENDPOINT_COUNT_ERRORS;
88
import static io.quarkus.websockets.next.runtime.telemetry.TelemetryConstants.SERVER_BYTES;
99
import static io.quarkus.websockets.next.runtime.telemetry.TelemetryConstants.SERVER_CONNECTION_CLOSED;
10+
import static io.quarkus.websockets.next.runtime.telemetry.TelemetryConstants.SERVER_CONNECTION_ON_OPEN_ERROR;
1011
import static io.quarkus.websockets.next.runtime.telemetry.TelemetryConstants.SERVER_CONNECTION_OPENED;
1112
import static io.quarkus.websockets.next.runtime.telemetry.TelemetryConstants.SERVER_CONNECTION_OPENED_ERROR;
1213
import static io.quarkus.websockets.next.runtime.telemetry.TelemetryConstants.SERVER_COUNT;
@@ -120,7 +121,7 @@ static Matcher<String> assertClientErrorTotal(String path, int clientErrorCount)
120121
}
121122

122123
static Matcher<String> assertServerConnectionOpeningFailedTotal(String path, int serverConnectionOpeningFailedCount) {
123-
return assertTotal(SERVER_CONNECTION_OPENED_ERROR, serverConnectionOpeningFailedCount, path, null);
124+
return assertTotal(SERVER_CONNECTION_ON_OPEN_ERROR, serverConnectionOpeningFailedCount, path, null);
124125
}
125126

126127
static Matcher<String> assertServerConnectionOpenedTotal(int serverConnectionOpenedCount) {

extensions/websockets-next/runtime/src/main/java/io/quarkus/websockets/next/runtime/Endpoints.java

+3
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,9 @@ public void handle(Void event) {
113113
});
114114
}
115115
} else {
116+
if (telemetrySupport != null) {
117+
telemetrySupport.connectionOpeningFailed(r.cause());
118+
}
116119
handleFailure(unhandledFailureStrategy, r.cause(), "Unable to complete @OnOpen callback", connection);
117120
}
118121
});

extensions/websockets-next/runtime/src/main/java/io/quarkus/websockets/next/runtime/telemetry/MetricsBuilderCustomizer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import static io.quarkus.websockets.next.runtime.telemetry.TelemetryConstants.CLIENT_ENDPOINT_COUNT_ERRORS;
77
import static io.quarkus.websockets.next.runtime.telemetry.TelemetryConstants.DIRECTION_TAG_KEY;
88
import static io.quarkus.websockets.next.runtime.telemetry.TelemetryConstants.SERVER_CONNECTION_CLOSED;
9+
import static io.quarkus.websockets.next.runtime.telemetry.TelemetryConstants.SERVER_CONNECTION_ON_OPEN_ERROR;
910
import static io.quarkus.websockets.next.runtime.telemetry.TelemetryConstants.SERVER_CONNECTION_OPENED;
10-
import static io.quarkus.websockets.next.runtime.telemetry.TelemetryConstants.SERVER_CONNECTION_OPENED_ERROR;
1111
import static io.quarkus.websockets.next.runtime.telemetry.TelemetryConstants.SERVER_ENDPOINT_COUNT_ERRORS;
1212
import static io.quarkus.websockets.next.runtime.telemetry.TelemetryConstants.Direction.INBOUND;
1313
import static io.quarkus.websockets.next.runtime.telemetry.TelemetryConstants.Direction.OUTBOUND;
@@ -98,7 +98,7 @@ public ErrorInterceptor apply(String path) {
9898
.withRegistry(meterRegistry);
9999

100100
private final Meter.MeterProvider<Counter> connectionOpeningFailedCounter = Counter
101-
.builder(SERVER_CONNECTION_OPENED_ERROR)
101+
.builder(SERVER_CONNECTION_ON_OPEN_ERROR)
102102
.description("Number of failures occurred when opening server connection failed.")
103103
.withRegistry(meterRegistry);
104104

extensions/websockets-next/runtime/src/main/java/io/quarkus/websockets/next/runtime/telemetry/MetricsConnectionInterceptor.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
final class MetricsConnectionInterceptor implements ConnectionInterceptor {
88

99
private final Counter connectionOpenCounter;
10-
private final Counter connectionOpeninigFailedCounter;
10+
private final Counter connectionOnOpenErrorsCounter;
1111

1212
MetricsConnectionInterceptor(Counter connectionOpenCounter, Counter connectionOpeninigFailedCounter) {
1313
this.connectionOpenCounter = connectionOpenCounter;
14-
this.connectionOpeninigFailedCounter = connectionOpeninigFailedCounter;
14+
this.connectionOnOpenErrorsCounter = connectionOpeninigFailedCounter;
1515
}
1616

1717
@Override
@@ -21,7 +21,7 @@ public void connectionOpened() {
2121

2222
@Override
2323
public void connectionOpeningFailed(Throwable cause) {
24-
connectionOpeninigFailedCounter.increment();
24+
connectionOnOpenErrorsCounter.increment();
2525
}
2626

2727
@Override

extensions/websockets-next/runtime/src/main/java/io/quarkus/websockets/next/runtime/telemetry/TelemetryConstants.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ private TelemetryConstants() {
2626
/**
2727
* Counts number of times that opening of a WebSocket server connection resulted in error.
2828
*/
29-
public static final String SERVER_CONNECTION_OPENED_ERROR = "quarkus.websockets.server.connections.opened.errors";
29+
public static final String SERVER_CONNECTION_ON_OPEN_ERROR = "quarkus.websockets.server.connections.onopen.errors";
3030

3131
/**
3232
* Counts number of times that opening of a WebSocket client connection resulted in error.

0 commit comments

Comments
 (0)