Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update HTTP metrics' descriptions #9635

Merged
merged 2 commits into from
Oct 9, 2023
Merged

Update HTTP metrics' descriptions #9635

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbeeec2
Update HTTP metrics' descriptions
Oct 9, 2023
cb57a56
http server/client tests
Oct 9, 2023
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
4 changes: 2 additions & 2 deletions ...io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientExperimentalMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@ private HttpClientExperimentalMetrics(Meter meter) {
meter
.histogramBuilder("http.client.request.size")
.setUnit("By")
.setDescription("The size of HTTP request messages")
.setDescription("Size of HTTP client request bodies.")
.ofLongs();
HttpMetricsAdvice.applyClientRequestSizeAdvice(requestSizeBuilder);
requestSize = requestSizeBuilder.build();
LongHistogramBuilder responseSizeBuilder =
meter
.histogramBuilder("http.client.response.size")
.setUnit("By")
.setDescription("The size of HTTP response messages")
.setDescription("Size of HTTP client response bodies.")
.ofLongs();
HttpMetricsAdvice.applyClientRequestSizeAdvice(responseSizeBuilder);
responseSize = responseSizeBuilder.build();
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ private HttpClientMetrics(Meter meter) {
if (SemconvStability.emitStableHttpSemconv()) {
DoubleHistogramBuilder stableDurationBuilder =
createStableDurationHistogramBuilder(
meter, "http.client.request.duration", "The duration of the outbound HTTP request");
meter, "http.client.request.duration", "Duration of HTTP client requests.");
HttpMetricsAdvice.applyStableClientDurationAdvice(stableDurationBuilder);
stableDuration = stableDurationBuilder.build();
} else {
Expand Down
6 changes: 3 additions & 3 deletions ...io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerExperimentalMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,22 +58,22 @@ private HttpServerExperimentalMetrics(Meter meter) {
meter
.upDownCounterBuilder("http.server.active_requests")
.setUnit("{requests}")
.setDescription("The number of concurrent HTTP requests that are currently in-flight");
.setDescription("Number of active HTTP server requests.");
HttpMetricsAdvice.applyServerActiveRequestsAdvice(activeRequestsBuilder);
activeRequests = activeRequestsBuilder.build();
LongHistogramBuilder requestSizeBuilder =
meter
.histogramBuilder("http.server.request.size")
.setUnit("By")
.setDescription("The size of HTTP request messages")
.setDescription("Size of HTTP server request bodies.")
.ofLongs();
HttpMetricsAdvice.applyServerRequestSizeAdvice(requestSizeBuilder);
requestSize = requestSizeBuilder.build();
LongHistogramBuilder responseSizeBuilder =
meter
.histogramBuilder("http.server.response.size")
.setUnit("By")
.setDescription("The size of HTTP response messages")
.setDescription("Size of HTTP server response bodies.")
.ofLongs();
HttpMetricsAdvice.applyServerRequestSizeAdvice(responseSizeBuilder);
responseSize = responseSizeBuilder.build();
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ private HttpServerMetrics(Meter meter) {
if (SemconvStability.emitStableHttpSemconv()) {
DoubleHistogramBuilder stableDurationBuilder =
createStableDurationHistogramBuilder(
meter, "http.server.request.duration", "The duration of the inbound HTTP request");
meter, "http.server.request.duration", "Duration of HTTP server requests.");
HttpMetricsAdvice.applyStableServerDurationAdvice(stableDurationBuilder);
stableDuration = stableDurationBuilder.build();
} else {
Expand Down
2 changes: 0 additions & 2 deletions ...pentelemetry/instrumentation/api/instrumenter/http/HttpServerExperimentalMetricsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ void collectsMetrics() {
metric ->
assertThat(metric)
.hasName("http.server.active_requests")
.hasDescription(
laurit marked this conversation as resolved.
Show resolved Hide resolved
"The number of concurrent HTTP requests that are currently in-flight")
.hasUnit("{requests}")
.hasLongSumSatisfying(
sum ->
Expand Down
2 changes: 2 additions & 0 deletions ...instrumentation/api/instrumenter/http/HttpClientExperimentalMetricsStableSemconvTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ void collectsMetrics() {
assertThat(metric)
.hasName("http.client.request.size")
.hasUnit("By")
.hasDescription("Size of HTTP client request bodies.")
.hasHistogramSatisfying(
histogram ->
histogram.hasPointsSatisfying(
Expand Down Expand Up @@ -109,6 +110,7 @@ void collectsMetrics() {
assertThat(metric)
.hasName("http.client.response.size")
.hasUnit("By")
.hasDescription("Size of HTTP client response bodies.")
.hasHistogramSatisfying(
histogram ->
histogram.hasPointsSatisfying(
Expand Down
1 change: 1 addition & 0 deletions ...entelemetry/instrumentation/api/instrumenter/http/HttpClientMetricsStableSemconvTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ void collectsMetrics() {
assertThat(metric)
.hasName("http.client.request.duration")
.hasUnit("s")
.hasDescription("Duration of HTTP client requests.")
.hasHistogramSatisfying(
histogram ->
histogram.hasPointsSatisfying(
Expand Down
5 changes: 3 additions & 2 deletions ...instrumentation/api/instrumenter/http/HttpServerExperimentalMetricsStableSemconvTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,8 @@ void collectsMetrics() {
metric ->
assertThat(metric)
.hasName("http.server.active_requests")
.hasDescription(
"The number of concurrent HTTP requests that are currently in-flight")
.hasUnit("{requests}")
.hasDescription("Number of active HTTP server requests.")
.hasLongSumSatisfying(
sum ->
sum.hasPointsSatisfying(
Expand Down Expand Up @@ -144,6 +143,7 @@ void collectsMetrics() {
assertThat(metric)
.hasName("http.server.request.size")
.hasUnit("By")
.hasDescription("Size of HTTP server request bodies.")
.hasHistogramSatisfying(
histogram ->
histogram.hasPointsSatisfying(
Expand All @@ -168,6 +168,7 @@ void collectsMetrics() {
assertThat(metric)
.hasName("http.server.response.size")
.hasUnit("By")
.hasDescription("Size of HTTP server response bodies.")
.hasHistogramSatisfying(
histogram ->
histogram.hasPointsSatisfying(
Expand Down
1 change: 1 addition & 0 deletions ...entelemetry/instrumentation/api/instrumenter/http/HttpServerMetricsStableSemconvTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ void collectsMetrics() {
metric ->
assertThat(metric)
.hasName("http.server.request.duration")
.hasDescription("Duration of HTTP server requests.")
.hasUnit("s")
.hasHistogramSatisfying(
histogram ->
Expand Down
Loading