Skip to content

Commit 59d62f4

Browse files
trasktrask
committed
simplify
1 parent 8bb3c7b commit 59d62f4

3 files changed

Lines changed: 47 additions & 49 deletions

File tree

‎instrumentation/graphql-java/graphql-java-common-12.0/testing/src/main/java/io/opentelemetry/instrumentation/graphql/common/v12_0/AbstractGraphqlTest.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,7 @@ void setup() throws IOException {
8181

8282
try (Reader reader =
8383
new InputStreamReader(
84-
requireNonNull(
85-
getClass().getClassLoader().getResourceAsStream("schema.graphqls"),
86-
"schema.graphqls"),
84+
requireNonNull(getClass().getClassLoader().getResourceAsStream("schema.graphqls")),
8785
UTF_8)) {
8886
graphqlSchema = buildSchema(reader);
8987
GraphQL.Builder graphqlBuilder = GraphQL.newGraphQL(graphqlSchema);

‎instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitOldRpcSemconv;
99
import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableRpcSemconv;
1010
import static io.opentelemetry.instrumentation.grpc.v1_6.AbstractGrpcTest.addExtraClientAttributes;
11-
import static io.opentelemetry.instrumentation.grpc.v1_6.AbstractGrpcTest.addExtraClientMetricAttributes;
1211
import static io.opentelemetry.instrumentation.grpc.v1_6.ExperimentalTestHelper.GRPC_RECEIVED_MESSAGE_COUNT;
1312
import static io.opentelemetry.instrumentation.grpc.v1_6.ExperimentalTestHelper.GRPC_SENT_MESSAGE_COUNT;
1413
import static io.opentelemetry.instrumentation.grpc.v1_6.ExperimentalTestHelper.experimentalSatisfies;
@@ -349,15 +348,18 @@ RPC_SERVICE, emitOldRpcSemconv() ? "example.Greeter" : null),
349348
histogram.hasPointsSatisfying(
350349
point ->
351350
point.hasAttributesSatisfyingExactly(
352-
addExtraClientMetricAttributes(
353-
equalTo(SERVER_ADDRESS, "localhost"),
354-
equalTo(SERVER_PORT, server.getPort()),
355-
equalTo(RPC_METHOD, "Conversation"),
356-
equalTo(RPC_SERVICE, "example.Greeter"),
357-
equalTo(RPC_SYSTEM, "grpc"),
358-
equalTo(
359-
RPC_GRPC_STATUS_CODE,
360-
(long) Status.Code.OK.value()))))));
351+
equalTo(SERVER_ADDRESS, "localhost"),
352+
equalTo(SERVER_PORT, server.getPort()),
353+
equalTo(RPC_METHOD, "Conversation"),
354+
equalTo(RPC_SERVICE, "example.Greeter"),
355+
equalTo(RPC_SYSTEM, "grpc"),
356+
equalTo(
357+
RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()),
358+
equalTo(
359+
NETWORK_TYPE,
360+
Boolean.getBoolean("testLatestDeps")
361+
? "ipv4"
362+
: null)))));
361363
}
362364
if (emitStableRpcSemconv()) {
363365
testing()

‎instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java‎

Lines changed: 34 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1719,15 +1719,6 @@ static List<AttributeAssertion> addExtraClientAttributes(AttributeAssertion... a
17191719
return result;
17201720
}
17211721

1722-
static AttributeAssertion[] addExtraClientMetricAttributes(AttributeAssertion... assertions) {
1723-
List<AttributeAssertion> result = new ArrayList<>();
1724-
result.addAll(asList(assertions));
1725-
if (Boolean.getBoolean("testLatestDeps")) {
1726-
result.add(equalTo(NETWORK_TYPE, "ipv4"));
1727-
}
1728-
return result.toArray(new AttributeAssertion[0]);
1729-
}
1730-
17311722
private void assertMetrics(Server server, Status.Code statusCode) {
17321723
boolean hasSizeMetric = statusCode == Status.Code.OK;
17331724
if (emitOldRpcSemconv()) {
@@ -1809,15 +1800,17 @@ private void assertMetrics(Server server, Status.Code statusCode) {
18091800
histogram.hasPointsSatisfying(
18101801
point ->
18111802
point.hasAttributesSatisfyingExactly(
1812-
addExtraClientMetricAttributes(
1813-
equalTo(SERVER_ADDRESS, "localhost"),
1814-
equalTo(SERVER_PORT, server.getPort()),
1815-
equalTo(RPC_METHOD, "SayHello"),
1816-
equalTo(RPC_SERVICE, "example.Greeter"),
1817-
equalTo(RPC_SYSTEM, "grpc"),
1818-
equalTo(
1819-
RPC_GRPC_STATUS_CODE,
1820-
(long) statusCode.value()))))));
1803+
equalTo(SERVER_ADDRESS, "localhost"),
1804+
equalTo(SERVER_PORT, server.getPort()),
1805+
equalTo(RPC_METHOD, "SayHello"),
1806+
equalTo(RPC_SERVICE, "example.Greeter"),
1807+
equalTo(RPC_SYSTEM, "grpc"),
1808+
equalTo(RPC_GRPC_STATUS_CODE, (long) statusCode.value()),
1809+
equalTo(
1810+
NETWORK_TYPE,
1811+
Boolean.getBoolean("testLatestDeps")
1812+
? "ipv4"
1813+
: null)))));
18211814

18221815
testing()
18231816
.waitAndAssertMetrics(
@@ -1831,15 +1824,17 @@ private void assertMetrics(Server server, Status.Code statusCode) {
18311824
histogram.hasPointsSatisfying(
18321825
point ->
18331826
point.hasAttributesSatisfyingExactly(
1834-
addExtraClientMetricAttributes(
1835-
equalTo(SERVER_ADDRESS, "localhost"),
1836-
equalTo(SERVER_PORT, server.getPort()),
1837-
equalTo(RPC_METHOD, "SayHello"),
1838-
equalTo(RPC_SERVICE, "example.Greeter"),
1839-
equalTo(RPC_SYSTEM, "grpc"),
1840-
equalTo(
1841-
RPC_GRPC_STATUS_CODE,
1842-
(long) statusCode.value()))))));
1827+
equalTo(SERVER_ADDRESS, "localhost"),
1828+
equalTo(SERVER_PORT, server.getPort()),
1829+
equalTo(RPC_METHOD, "SayHello"),
1830+
equalTo(RPC_SERVICE, "example.Greeter"),
1831+
equalTo(RPC_SYSTEM, "grpc"),
1832+
equalTo(RPC_GRPC_STATUS_CODE, (long) statusCode.value()),
1833+
equalTo(
1834+
NETWORK_TYPE,
1835+
Boolean.getBoolean("testLatestDeps")
1836+
? "ipv4"
1837+
: null)))));
18431838
if (hasSizeMetric) {
18441839
testing()
18451840
.waitAndAssertMetrics(
@@ -1853,15 +1848,18 @@ private void assertMetrics(Server server, Status.Code statusCode) {
18531848
histogram.hasPointsSatisfying(
18541849
point ->
18551850
point.hasAttributesSatisfyingExactly(
1856-
addExtraClientMetricAttributes(
1857-
equalTo(SERVER_ADDRESS, "localhost"),
1858-
equalTo(SERVER_PORT, server.getPort()),
1859-
equalTo(RPC_METHOD, "SayHello"),
1860-
equalTo(RPC_SERVICE, "example.Greeter"),
1861-
equalTo(RPC_SYSTEM, "grpc"),
1862-
equalTo(
1863-
RPC_GRPC_STATUS_CODE,
1864-
(long) statusCode.value()))))));
1851+
equalTo(SERVER_ADDRESS, "localhost"),
1852+
equalTo(SERVER_PORT, server.getPort()),
1853+
equalTo(RPC_METHOD, "SayHello"),
1854+
equalTo(RPC_SERVICE, "example.Greeter"),
1855+
equalTo(RPC_SYSTEM, "grpc"),
1856+
equalTo(
1857+
RPC_GRPC_STATUS_CODE, (long) statusCode.value()),
1858+
equalTo(
1859+
NETWORK_TYPE,
1860+
Boolean.getBoolean("testLatestDeps")
1861+
? "ipv4"
1862+
: null)))));
18651863
}
18661864
}
18671865
if (emitStableRpcSemconv()) {

0 commit comments

Comments
 (0)