Skip to content

Commit 8519134

Browse files
trasktrask
committed
more
1 parent 00bc62e commit 8519134

File tree

6 files changed

+20
-4
lines changed
  • instrumentation
    • elasticsearch
      • elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0
      • elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4
      • elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0
    • kubernetes-client-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient
    • lettuce

6 files changed

+20
-4
lines changed

‎instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import static io.opentelemetry.semconv.UrlAttributes.URL_FULL;
1717
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
1818
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM_NAME;
19+
import static io.opentelemetry.semconv.incubating.PeerIncubatingAttributes.PEER_SERVICE;
1920
import static org.assertj.core.api.Assertions.assertThat;
2021

2122
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -191,6 +192,7 @@ public void onFailure(Exception e) {
191192
equalTo(SERVER_PORT, httpHost.getPort()),
192193
equalTo(HTTP_REQUEST_METHOD, "GET"),
193194
equalTo(NETWORK_PROTOCOL_VERSION, "1.1"),
195+
equalTo(PEER_SERVICE, "test-peer-service"),
194196
equalTo(URL_FULL, httpHost.toURI() + "/_cluster/health"),
195197
equalTo(HTTP_RESPONSE_STATUS_CODE, 200)),
196198
span ->

‎instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import static io.opentelemetry.semconv.UrlAttributes.URL_FULL;
1717
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
1818
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM_NAME;
19+
import static io.opentelemetry.semconv.incubating.PeerIncubatingAttributes.PEER_SERVICE;
1920
import static org.assertj.core.api.Assertions.assertThat;
2021

2122
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -181,6 +182,7 @@ public void onFailure(Exception e) {
181182
equalTo(SERVER_PORT, httpHost.getPort()),
182183
equalTo(HTTP_REQUEST_METHOD, "GET"),
183184
equalTo(NETWORK_PROTOCOL_VERSION, "1.1"),
185+
equalTo(PEER_SERVICE, "test-peer-service"),
184186
equalTo(URL_FULL, httpHost.toURI() + "/_cluster/health"),
185187
equalTo(HTTP_RESPONSE_STATUS_CODE, 200)),
186188
span ->

‎instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import static io.opentelemetry.semconv.UrlAttributes.URL_FULL;
1818
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
1919
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM_NAME;
20+
import static io.opentelemetry.semconv.incubating.PeerIncubatingAttributes.PEER_SERVICE;
2021
import static org.assertj.core.api.Assertions.assertThat;
2122

2223
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -108,6 +109,7 @@ void elasticsearchStatus() throws Exception {
108109
equalTo(SERVER_PORT, httpHost.getPort()),
109110
equalTo(HTTP_REQUEST_METHOD, "GET"),
110111
equalTo(NETWORK_PROTOCOL_VERSION, "1.1"),
112+
equalTo(PEER_SERVICE, "test-peer-service"),
111113
equalTo(URL_FULL, httpHost.toURI() + "/_cluster/health"),
112114
equalTo(HTTP_RESPONSE_STATUS_CODE, 200L))));
113115

@@ -185,6 +187,7 @@ public void onFailure(Exception e) {
185187
equalTo(SERVER_PORT, httpHost.getPort()),
186188
equalTo(HTTP_REQUEST_METHOD, "GET"),
187189
equalTo(NETWORK_PROTOCOL_VERSION, "1.1"),
190+
equalTo(PEER_SERVICE, "test-peer-service"),
188191
equalTo(URL_FULL, httpHost.toURI() + "/_cluster/health"),
189192
equalTo(HTTP_RESPONSE_STATUS_CODE, 200L)),
190193
span ->

‎instrumentation/kubernetes-client-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientTest.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
1414
import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
1515
import static io.opentelemetry.semconv.UrlAttributes.URL_FULL;
16+
import static io.opentelemetry.semconv.incubating.PeerIncubatingAttributes.PEER_SERVICE;
1617
import static org.assertj.core.api.Assertions.assertThat;
1718

1819
import io.kubernetes.client.openapi.ApiCallback;
@@ -89,6 +90,7 @@ void synchronousCall() throws ApiException {
8990
equalTo(HTTP_RESPONSE_STATUS_CODE, 200),
9091
equalTo(SERVER_ADDRESS, "127.0.0.1"),
9192
equalTo(SERVER_PORT, mockWebServer.httpPort()),
93+
equalTo(PEER_SERVICE, "test-peer-service"),
9294
equalTo(
9395
AttributeKey.stringKey("kubernetes-client.namespace"), "namespace"),
9496
equalTo(AttributeKey.stringKey("kubernetes-client.name"), "name"))));
@@ -136,6 +138,7 @@ void handleErrorsInSyncCall() {
136138
equalTo(HTTP_RESPONSE_STATUS_CODE, 451),
137139
equalTo(SERVER_ADDRESS, "127.0.0.1"),
138140
equalTo(SERVER_PORT, mockWebServer.httpPort()),
141+
equalTo(PEER_SERVICE, "test-peer-service"),
139142
equalTo(ERROR_TYPE, "451"),
140143
equalTo(
141144
AttributeKey.stringKey("kubernetes-client.namespace"), "namespace"),
@@ -190,6 +193,7 @@ public void onSuccess(
190193
equalTo(HTTP_RESPONSE_STATUS_CODE, 200),
191194
equalTo(SERVER_ADDRESS, "127.0.0.1"),
192195
equalTo(SERVER_PORT, mockWebServer.httpPort()),
196+
equalTo(PEER_SERVICE, "test-peer-service"),
193197
equalTo(
194198
AttributeKey.stringKey("kubernetes-client.namespace"), "namespace"),
195199
equalTo(AttributeKey.stringKey("kubernetes-client.name"), "name")),
@@ -251,6 +255,7 @@ public void onFailure(
251255
equalTo(HTTP_RESPONSE_STATUS_CODE, 451),
252256
equalTo(SERVER_ADDRESS, "127.0.0.1"),
253257
equalTo(SERVER_PORT, mockWebServer.httpPort()),
258+
equalTo(PEER_SERVICE, "test-peer-service"),
254259
equalTo(ERROR_TYPE, "451"),
255260
equalTo(
256261
AttributeKey.stringKey("kubernetes-client.namespace"), "namespace"),

‎instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceAsyncClientTest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
1414
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION;
1515
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
16+
import static io.opentelemetry.semconv.incubating.PeerIncubatingAttributes.PEER_SERVICE;
1617
import static org.assertj.core.api.Assertions.assertThat;
1718
import static org.assertj.core.api.Assertions.catchException;
1819
import static org.assertj.core.api.Assertions.catchThrowable;
@@ -152,9 +153,10 @@ void testConnectUsingGetOnConnectionFuture() {
152153
span.hasName("CONNECT")
153154
.hasKind(SpanKind.CLIENT)
154155
.hasAttributesSatisfyingExactly(
156+
equalTo(maybeStable(DB_SYSTEM), "redis"),
157+
equalTo(PEER_SERVICE, "test-peer-service"),
155158
equalTo(SERVER_ADDRESS, host),
156-
equalTo(SERVER_PORT, port),
157-
equalTo(maybeStable(DB_SYSTEM), "redis"))));
159+
equalTo(SERVER_PORT, port))));
158160
}
159161

160162
@Test

‎instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceAsyncClientTest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION;
1616
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT;
1717
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
18+
import static io.opentelemetry.semconv.incubating.PeerIncubatingAttributes.PEER_SERVICE;
1819
import static org.assertj.core.api.Assertions.assertThat;
1920
import static org.assertj.core.api.Assertions.catchException;
2021
import static org.assertj.core.api.Assertions.catchThrowable;
@@ -124,9 +125,10 @@ void testConnectUsingGetOnConnectionFuture() throws ExecutionException, Interrup
124125
span.hasName("CONNECT")
125126
.hasKind(SpanKind.CLIENT)
126127
.hasAttributesSatisfyingExactly(
128+
equalTo(maybeStable(DB_SYSTEM), "redis"),
129+
equalTo(PEER_SERVICE, "test-peer-service"),
127130
equalTo(SERVER_ADDRESS, host),
128-
equalTo(SERVER_PORT, port),
129-
equalTo(maybeStable(DB_SYSTEM), "redis"))));
131+
equalTo(SERVER_PORT, port))));
130132
}
131133

132134
@SuppressWarnings("deprecation") // RedisURI constructor

0 commit comments

Comments
 (0)