diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientStatusConverterTest.groovy b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientStatusConverterTest.groovy deleted file mode 100644 index 8cf2f5c079..0000000000 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientStatusConverterTest.groovy +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * SPDX-License-Identifier: Apache-2.0 - */ - -package io.opentelemetry.instrumentation.api.instrumenter.http - -import io.opentelemetry.api.trace.StatusCode -import spock.lang.Specification - -class HttpClientStatusConverterTest extends Specification { - - def "test HTTP #httpStatus to OTel #expectedStatus"() { - when: - def status = HttpStatusConverter.CLIENT.statusFromHttpStatus(httpStatus) - - then: - status == expectedStatus - - // https://en.wikipedia.org/wiki/List_of_HTTP_status_codes - where: - httpStatus | expectedStatus - 100 | StatusCode.UNSET - 101 | StatusCode.UNSET - 102 | StatusCode.UNSET - 103 | StatusCode.UNSET - - 200 | StatusCode.UNSET - 201 | StatusCode.UNSET - 202 | StatusCode.UNSET - 203 | StatusCode.UNSET - 204 | StatusCode.UNSET - 205 | StatusCode.UNSET - 206 | StatusCode.UNSET - 207 | StatusCode.UNSET - 208 | StatusCode.UNSET - 226 | StatusCode.UNSET - - 300 | StatusCode.UNSET - 301 | StatusCode.UNSET - 302 | StatusCode.UNSET - 303 | StatusCode.UNSET - 304 | StatusCode.UNSET - 305 | StatusCode.UNSET - 306 | StatusCode.UNSET - 307 | StatusCode.UNSET - 308 | StatusCode.UNSET - - 400 | StatusCode.ERROR - 401 | StatusCode.ERROR - 403 | StatusCode.ERROR - 404 | StatusCode.ERROR - 405 | StatusCode.ERROR - 406 | StatusCode.ERROR - 407 | StatusCode.ERROR - 408 | StatusCode.ERROR - 409 | StatusCode.ERROR - 410 | StatusCode.ERROR - 411 | StatusCode.ERROR - 412 | StatusCode.ERROR - 413 | StatusCode.ERROR - 414 | StatusCode.ERROR - 415 | StatusCode.ERROR - 416 | StatusCode.ERROR - 417 | StatusCode.ERROR - 418 | StatusCode.ERROR - 421 | StatusCode.ERROR - 422 | StatusCode.ERROR - 423 | StatusCode.ERROR - 424 | StatusCode.ERROR - 425 | StatusCode.ERROR - 426 | StatusCode.ERROR - 428 | StatusCode.ERROR - 429 | StatusCode.ERROR - 431 | StatusCode.ERROR - 451 | StatusCode.ERROR - - 500 | StatusCode.ERROR - 501 | StatusCode.ERROR - 502 | StatusCode.ERROR - 503 | StatusCode.ERROR - 504 | StatusCode.ERROR - 505 | StatusCode.ERROR - 506 | StatusCode.ERROR - 507 | StatusCode.ERROR - 508 | StatusCode.ERROR - 510 | StatusCode.ERROR - 511 | StatusCode.ERROR - - // Don't exist - 99 | StatusCode.ERROR - 600 | StatusCode.ERROR - } -} diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientStatusConverterTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientStatusConverterTest.java new file mode 100644 index 0000000000..7840ad60ed --- /dev/null +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientStatusConverterTest.java @@ -0,0 +1,94 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.instrumentation.api.instrumenter.http; + +import static io.opentelemetry.instrumentation.api.instrumenter.http.HttpStatusConverter.CLIENT; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import io.opentelemetry.api.trace.StatusCode; +import java.util.stream.Stream; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +public class HttpClientStatusConverterTest { + + @ParameterizedTest + @MethodSource("generateParams") + void httpStatusCodeToOtelStatus(int numeric, StatusCode code) { + assertEquals(code, CLIENT.statusFromHttpStatus(numeric)); + } + + static Stream generateParams() { + return Stream.of( + Arguments.of(100, StatusCode.UNSET), + Arguments.of(101, StatusCode.UNSET), + Arguments.of(102, StatusCode.UNSET), + Arguments.of(103, StatusCode.UNSET), + Arguments.of(200, StatusCode.UNSET), + Arguments.of(201, StatusCode.UNSET), + Arguments.of(202, StatusCode.UNSET), + Arguments.of(203, StatusCode.UNSET), + Arguments.of(204, StatusCode.UNSET), + Arguments.of(205, StatusCode.UNSET), + Arguments.of(206, StatusCode.UNSET), + Arguments.of(207, StatusCode.UNSET), + Arguments.of(208, StatusCode.UNSET), + Arguments.of(226, StatusCode.UNSET), + Arguments.of(300, StatusCode.UNSET), + Arguments.of(301, StatusCode.UNSET), + Arguments.of(302, StatusCode.UNSET), + Arguments.of(303, StatusCode.UNSET), + Arguments.of(304, StatusCode.UNSET), + Arguments.of(305, StatusCode.UNSET), + Arguments.of(306, StatusCode.UNSET), + Arguments.of(307, StatusCode.UNSET), + Arguments.of(308, StatusCode.UNSET), + Arguments.of(400, StatusCode.ERROR), + Arguments.of(401, StatusCode.ERROR), + Arguments.of(403, StatusCode.ERROR), + Arguments.of(404, StatusCode.ERROR), + Arguments.of(405, StatusCode.ERROR), + Arguments.of(406, StatusCode.ERROR), + Arguments.of(407, StatusCode.ERROR), + Arguments.of(408, StatusCode.ERROR), + Arguments.of(409, StatusCode.ERROR), + Arguments.of(410, StatusCode.ERROR), + Arguments.of(411, StatusCode.ERROR), + Arguments.of(412, StatusCode.ERROR), + Arguments.of(413, StatusCode.ERROR), + Arguments.of(414, StatusCode.ERROR), + Arguments.of(415, StatusCode.ERROR), + Arguments.of(416, StatusCode.ERROR), + Arguments.of(417, StatusCode.ERROR), + Arguments.of(418, StatusCode.ERROR), + Arguments.of(421, StatusCode.ERROR), + Arguments.of(422, StatusCode.ERROR), + Arguments.of(423, StatusCode.ERROR), + Arguments.of(424, StatusCode.ERROR), + Arguments.of(425, StatusCode.ERROR), + Arguments.of(426, StatusCode.ERROR), + Arguments.of(428, StatusCode.ERROR), + Arguments.of(429, StatusCode.ERROR), + Arguments.of(431, StatusCode.ERROR), + Arguments.of(451, StatusCode.ERROR), + Arguments.of(500, StatusCode.ERROR), + Arguments.of(501, StatusCode.ERROR), + Arguments.of(502, StatusCode.ERROR), + Arguments.of(503, StatusCode.ERROR), + Arguments.of(504, StatusCode.ERROR), + Arguments.of(505, StatusCode.ERROR), + Arguments.of(506, StatusCode.ERROR), + Arguments.of(507, StatusCode.ERROR), + Arguments.of(508, StatusCode.ERROR), + Arguments.of(510, StatusCode.ERROR), + Arguments.of(511, StatusCode.ERROR), + + // Don't exist + Arguments.of(99, StatusCode.ERROR), + Arguments.of(600, StatusCode.ERROR)); + } +} diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerStatusConverterTest.groovy b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerStatusConverterTest.groovy deleted file mode 100644 index 96714ed18e..0000000000 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerStatusConverterTest.groovy +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * SPDX-License-Identifier: Apache-2.0 - */ - -package io.opentelemetry.instrumentation.api.instrumenter.http - -import io.opentelemetry.api.trace.StatusCode -import spock.lang.Specification - -class HttpServerStatusConverterTest extends Specification { - - def "test HTTP #httpStatus to OTel #expectedStatus"() { - when: - def status = HttpStatusConverter.SERVER.statusFromHttpStatus(httpStatus) - - then: - status == expectedStatus - - // https://en.wikipedia.org/wiki/List_of_HTTP_status_codes - where: - httpStatus | expectedStatus - 100 | StatusCode.UNSET - 101 | StatusCode.UNSET - 102 | StatusCode.UNSET - 103 | StatusCode.UNSET - - 200 | StatusCode.UNSET - 201 | StatusCode.UNSET - 202 | StatusCode.UNSET - 203 | StatusCode.UNSET - 204 | StatusCode.UNSET - 205 | StatusCode.UNSET - 206 | StatusCode.UNSET - 207 | StatusCode.UNSET - 208 | StatusCode.UNSET - 226 | StatusCode.UNSET - - 300 | StatusCode.UNSET - 301 | StatusCode.UNSET - 302 | StatusCode.UNSET - 303 | StatusCode.UNSET - 304 | StatusCode.UNSET - 305 | StatusCode.UNSET - 306 | StatusCode.UNSET - 307 | StatusCode.UNSET - 308 | StatusCode.UNSET - - 400 | StatusCode.UNSET - 401 | StatusCode.UNSET - 403 | StatusCode.UNSET - 404 | StatusCode.UNSET - 405 | StatusCode.UNSET - 406 | StatusCode.UNSET - 407 | StatusCode.UNSET - 408 | StatusCode.UNSET - 409 | StatusCode.UNSET - 410 | StatusCode.UNSET - 411 | StatusCode.UNSET - 412 | StatusCode.UNSET - 413 | StatusCode.UNSET - 414 | StatusCode.UNSET - 415 | StatusCode.UNSET - 416 | StatusCode.UNSET - 417 | StatusCode.UNSET - 418 | StatusCode.UNSET - 421 | StatusCode.UNSET - 422 | StatusCode.UNSET - 423 | StatusCode.UNSET - 424 | StatusCode.UNSET - 425 | StatusCode.UNSET - 426 | StatusCode.UNSET - 428 | StatusCode.UNSET - 429 | StatusCode.UNSET - 431 | StatusCode.UNSET - 451 | StatusCode.UNSET - - 500 | StatusCode.ERROR - 501 | StatusCode.ERROR - 502 | StatusCode.ERROR - 503 | StatusCode.ERROR - 504 | StatusCode.ERROR - 505 | StatusCode.ERROR - 506 | StatusCode.ERROR - 507 | StatusCode.ERROR - 508 | StatusCode.ERROR - 510 | StatusCode.ERROR - 511 | StatusCode.ERROR - - // Don't exist - 99 | StatusCode.ERROR - 600 | StatusCode.ERROR - } -} diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerStatusConverterTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerStatusConverterTest.java new file mode 100644 index 0000000000..532c533809 --- /dev/null +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerStatusConverterTest.java @@ -0,0 +1,94 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.instrumentation.api.instrumenter.http; + +import static io.opentelemetry.instrumentation.api.instrumenter.http.HttpStatusConverter.SERVER; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import io.opentelemetry.api.trace.StatusCode; +import java.util.stream.Stream; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +public class HttpServerStatusConverterTest { + + @ParameterizedTest + @MethodSource("generateParams") + void httpStatusCodeToOtelStatus(int numeric, StatusCode code) { + assertEquals(code, SERVER.statusFromHttpStatus(numeric)); + } + + static Stream generateParams() { + return Stream.of( + Arguments.of(100, StatusCode.UNSET), + Arguments.of(101, StatusCode.UNSET), + Arguments.of(102, StatusCode.UNSET), + Arguments.of(103, StatusCode.UNSET), + Arguments.of(200, StatusCode.UNSET), + Arguments.of(201, StatusCode.UNSET), + Arguments.of(202, StatusCode.UNSET), + Arguments.of(203, StatusCode.UNSET), + Arguments.of(204, StatusCode.UNSET), + Arguments.of(205, StatusCode.UNSET), + Arguments.of(206, StatusCode.UNSET), + Arguments.of(207, StatusCode.UNSET), + Arguments.of(208, StatusCode.UNSET), + Arguments.of(226, StatusCode.UNSET), + Arguments.of(300, StatusCode.UNSET), + Arguments.of(301, StatusCode.UNSET), + Arguments.of(302, StatusCode.UNSET), + Arguments.of(303, StatusCode.UNSET), + Arguments.of(304, StatusCode.UNSET), + Arguments.of(305, StatusCode.UNSET), + Arguments.of(306, StatusCode.UNSET), + Arguments.of(307, StatusCode.UNSET), + Arguments.of(308, StatusCode.UNSET), + Arguments.of(400, StatusCode.UNSET), + Arguments.of(401, StatusCode.UNSET), + Arguments.of(403, StatusCode.UNSET), + Arguments.of(404, StatusCode.UNSET), + Arguments.of(405, StatusCode.UNSET), + Arguments.of(406, StatusCode.UNSET), + Arguments.of(407, StatusCode.UNSET), + Arguments.of(408, StatusCode.UNSET), + Arguments.of(409, StatusCode.UNSET), + Arguments.of(410, StatusCode.UNSET), + Arguments.of(411, StatusCode.UNSET), + Arguments.of(412, StatusCode.UNSET), + Arguments.of(413, StatusCode.UNSET), + Arguments.of(414, StatusCode.UNSET), + Arguments.of(415, StatusCode.UNSET), + Arguments.of(416, StatusCode.UNSET), + Arguments.of(417, StatusCode.UNSET), + Arguments.of(418, StatusCode.UNSET), + Arguments.of(421, StatusCode.UNSET), + Arguments.of(422, StatusCode.UNSET), + Arguments.of(423, StatusCode.UNSET), + Arguments.of(424, StatusCode.UNSET), + Arguments.of(425, StatusCode.UNSET), + Arguments.of(426, StatusCode.UNSET), + Arguments.of(428, StatusCode.UNSET), + Arguments.of(429, StatusCode.UNSET), + Arguments.of(431, StatusCode.UNSET), + Arguments.of(451, StatusCode.UNSET), + Arguments.of(500, StatusCode.ERROR), + Arguments.of(501, StatusCode.ERROR), + Arguments.of(502, StatusCode.ERROR), + Arguments.of(503, StatusCode.ERROR), + Arguments.of(504, StatusCode.ERROR), + Arguments.of(505, StatusCode.ERROR), + Arguments.of(506, StatusCode.ERROR), + Arguments.of(507, StatusCode.ERROR), + Arguments.of(508, StatusCode.ERROR), + Arguments.of(510, StatusCode.ERROR), + Arguments.of(511, StatusCode.ERROR), + + // Don't exist + Arguments.of(99, StatusCode.ERROR), + Arguments.of(600, StatusCode.ERROR)); + } +}