Skip to content

Commit 656dcc2

Browse files
trasktrask
committed
simplify
1 parent 8bb3c7b commit 656dcc2

2 files changed

Lines changed: 50 additions & 46 deletions

File tree

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

Lines changed: 13 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,19 @@ 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,
358+
(long) Status.Code.OK.value()),
359+
equalTo(
360+
NETWORK_TYPE,
361+
Boolean.getBoolean("testLatestDeps")
362+
? "ipv4"
363+
: null)))));
361364
}
362365
if (emitStableRpcSemconv()) {
363366
testing()

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

Lines changed: 37 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,18 @@ 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(
1809+
RPC_GRPC_STATUS_CODE, (long) statusCode.value()),
1810+
equalTo(
1811+
NETWORK_TYPE,
1812+
Boolean.getBoolean("testLatestDeps")
1813+
? "ipv4"
1814+
: null)))));
18211815

18221816
testing()
18231817
.waitAndAssertMetrics(
@@ -1831,15 +1825,18 @@ private void assertMetrics(Server server, Status.Code statusCode) {
18311825
histogram.hasPointsSatisfying(
18321826
point ->
18331827
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()))))));
1828+
equalTo(SERVER_ADDRESS, "localhost"),
1829+
equalTo(SERVER_PORT, server.getPort()),
1830+
equalTo(RPC_METHOD, "SayHello"),
1831+
equalTo(RPC_SERVICE, "example.Greeter"),
1832+
equalTo(RPC_SYSTEM, "grpc"),
1833+
equalTo(
1834+
RPC_GRPC_STATUS_CODE, (long) statusCode.value()),
1835+
equalTo(
1836+
NETWORK_TYPE,
1837+
Boolean.getBoolean("testLatestDeps")
1838+
? "ipv4"
1839+
: null)))));
18431840
if (hasSizeMetric) {
18441841
testing()
18451842
.waitAndAssertMetrics(
@@ -1853,15 +1850,19 @@ private void assertMetrics(Server server, Status.Code statusCode) {
18531850
histogram.hasPointsSatisfying(
18541851
point ->
18551852
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()))))));
1853+
equalTo(SERVER_ADDRESS, "localhost"),
1854+
equalTo(SERVER_PORT, server.getPort()),
1855+
equalTo(RPC_METHOD, "SayHello"),
1856+
equalTo(RPC_SERVICE, "example.Greeter"),
1857+
equalTo(RPC_SYSTEM, "grpc"),
1858+
equalTo(
1859+
RPC_GRPC_STATUS_CODE,
1860+
(long) statusCode.value()),
1861+
equalTo(
1862+
NETWORK_TYPE,
1863+
Boolean.getBoolean("testLatestDeps")
1864+
? "ipv4"
1865+
: null)))));
18651866
}
18661867
}
18671868
if (emitStableRpcSemconv()) {

0 commit comments

Comments
 (0)