Revert "Update http metrics to the latest version (open-telemetry#11659…

…)" This reverts commit 9f7aec5.
zeitlinger · Jul 1, 2024 · cda1e8f · cda1e8f
1 parent 79e4a21
commit cda1e8f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/...entelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetrics.java b/...entelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetrics.java
@@ -24,9 +24,9 @@
  * {@link OperationListener} which keeps track of <a
  * href="https://github.com/open-telemetry/semantic-conventions/blob/main/docs/http/http-metrics.md#http-client">non-stable
  * HTTP client metrics</a>: <a
- * href="https://github.com/open-telemetry/semantic-conventions/blob/main/docs/http/http-metrics.md#metric-httpclientrequestbodysize">the
+ * href="https://github.com/open-telemetry/semantic-conventions/blob/main/docs/http/http-metrics.md#metric-httpclientrequestsize">the
  * request size </a> and <a
- * href="https://github.com/open-telemetry/semantic-conventions/blob/main/docs/http/http-metrics.md#metric-httpclientresponsebodysize">
+ * href="https://github.com/open-telemetry/semantic-conventions/blob/main/docs/http/http-metrics.md#metric-httpclientresponsesize">
  * the response size</a>.
  */
 public final class HttpClientExperimentalMetrics implements OperationListener {
@@ -53,15 +53,15 @@ public static OperationMetrics get() {
   private HttpClientExperimentalMetrics(Meter meter) {
     LongHistogramBuilder requestSizeBuilder =
         meter
-            .histogramBuilder("http.client.request.body.size")
+            .histogramBuilder("http.client.request.size")
             .setUnit("By")
             .setDescription("Size of HTTP client request bodies.")
             .ofLongs();
     HttpExperimentalMetricsAdvice.applyClientRequestSizeAdvice(requestSizeBuilder);
     requestSize = requestSizeBuilder.build();
     LongHistogramBuilder responseSizeBuilder =
         meter
-            .histogramBuilder("http.client.response.body.size")
+            .histogramBuilder("http.client.response.size")
             .setUnit("By")
             .setDescription("Size of HTTP client response bodies.")
             .ofLongs();

diff --git a/...entelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetrics.java b/...entelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetrics.java
@@ -28,9 +28,9 @@
  * HTTP server metrics</a>: <a
  * href="https://github.com/open-telemetry/semantic-conventions/blob/main/docs/http/http-metrics.md#metric-httpserveractive_requests">the
  * number of in-flight request</a>, <a
- * href="https://github.com/open-telemetry/semantic-conventions/blob/main/docs/http/http-metrics.md#metric-httpserverrequestbodysize">the
+ * href="https://github.com/open-telemetry/semantic-conventions/blob/main/docs/http/http-metrics.md#metric-httpserverrequestsize">the
  * request size</a> and <a
- * href="https://github.com/open-telemetry/semantic-conventions/blob/main/docs/http/http-metrics.md#metric-httpserverresponsebodysize">the
+ * href="https://github.com/open-telemetry/semantic-conventions/blob/main/docs/http/http-metrics.md#metric-httpserverresponsesize">the
  * response size</a>.
  */
 public final class HttpServerExperimentalMetrics implements OperationListener {
@@ -65,15 +65,15 @@ private HttpServerExperimentalMetrics(Meter meter) {
     activeRequests = activeRequestsBuilder.build();
     LongHistogramBuilder requestSizeBuilder =
         meter
-            .histogramBuilder("http.server.request.body.size")
+            .histogramBuilder("http.server.request.size")
             .setUnit("By")
             .setDescription("Size of HTTP server request bodies.")
             .ofLongs();
     HttpExperimentalMetricsAdvice.applyServerRequestSizeAdvice(requestSizeBuilder);
     requestSize = requestSizeBuilder.build();
     LongHistogramBuilder responseSizeBuilder =
         meter
-            .histogramBuilder("http.server.response.body.size")
+            .histogramBuilder("http.server.response.size")
             .setUnit("By")
             .setDescription("Size of HTTP server response bodies.")
             .ofLongs();

diff --git a/...lemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java b/...lemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java
@@ -83,7 +83,7 @@ void collectsMetrics() {
         .satisfiesExactlyInAnyOrder(
             metric ->
                 assertThat(metric)
-                    .hasName("http.client.request.body.size")
+                    .hasName("http.client.request.size")
                     .hasUnit("By")
                     .hasDescription("Size of HTTP client request bodies.")
                     .hasHistogramSatisfying(
@@ -109,7 +109,7 @@ void collectsMetrics() {
                                                     .hasSpanId("090a0b0c0d0e0f00")))),
             metric ->
                 assertThat(metric)
-                    .hasName("http.client.response.body.size")
+                    .hasName("http.client.response.size")
                     .hasUnit("By")
                     .hasDescription("Size of HTTP client response bodies.")
                     .hasHistogramSatisfying(
@@ -140,13 +140,13 @@ void collectsMetrics() {
         .satisfiesExactlyInAnyOrder(
             metric ->
                 assertThat(metric)
-                    .hasName("http.client.request.body.size")
+                    .hasName("http.client.request.size")
                     .hasHistogramSatisfying(
                         histogram ->
                             histogram.hasPointsSatisfying(point -> point.hasSum(200 /* bytes */))),
             metric ->
                 assertThat(metric)
-                    .hasName("http.client.response.body.size")
+                    .hasName("http.client.response.size")
                     .hasHistogramSatisfying(
                         histogram ->
                             histogram.hasPointsSatisfying(point -> point.hasSum(400 /* bytes */))));

diff --git a/...lemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java b/...lemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java
@@ -147,7 +147,7 @@ void collectsMetrics() {
                                                     .hasSpanId(spanContext1.getSpanId())))),
             metric ->
                 assertThat(metric)
-                    .hasName("http.server.request.body.size")
+                    .hasName("http.server.request.size")
                     .hasUnit("By")
                     .hasDescription("Size of HTTP server request bodies.")
                     .hasHistogramSatisfying(
@@ -172,7 +172,7 @@ void collectsMetrics() {
                                                     .hasSpanId(spanContext1.getSpanId())))),
             metric ->
                 assertThat(metric)
-                    .hasName("http.server.response.body.size")
+                    .hasName("http.server.response.size")
                     .hasUnit("By")
                     .hasDescription("Size of HTTP server response bodies.")
                     .hasHistogramSatisfying(
@@ -216,7 +216,7 @@ void collectsMetrics() {
                                                     .hasSpanId(spanContext2.getSpanId())))),
             metric ->
                 assertThat(metric)
-                    .hasName("http.server.request.body.size")
+                    .hasName("http.server.request.size")
                     .hasHistogramSatisfying(
                         histogram ->
                             histogram.hasPointsSatisfying(
@@ -230,7 +230,7 @@ void collectsMetrics() {
                                                     .hasSpanId(spanContext2.getSpanId())))),
             metric ->
                 assertThat(metric)
-                    .hasName("http.server.response.body.size")
+                    .hasName("http.server.response.size")
                     .hasHistogramSatisfying(
                         histogram ->
                             histogram.hasPointsSatisfying(