Skip to content

Commit 8c33824

Browse files
trasktrask
committed
more
1 parent 00bc62e commit 8c33824

File tree

15 files changed

+69
-19
lines changed

15 files changed

+69
-19
lines changed

‎instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION_NAME;
2121
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
2222
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM_NAME;
23+
import static io.opentelemetry.semconv.incubating.PeerIncubatingAttributes.PEER_SERVICE;
2324
import static org.assertj.core.api.Assertions.assertThat;
2425

2526
import co.elastic.clients.elasticsearch.ElasticsearchAsyncClient;
@@ -118,6 +119,7 @@ void elasticsearchStatus() throws IOException {
118119
equalTo(SERVER_PORT, httpHost.getPort()),
119120
equalTo(HTTP_REQUEST_METHOD, "GET"),
120121
equalTo(NETWORK_PROTOCOL_VERSION, "1.1"),
122+
equalTo(PEER_SERVICE, "test-peer-service"),
121123
equalTo(URL_FULL, httpHost.toURI() + "/"),
122124
equalTo(HTTP_RESPONSE_STATUS_CODE, 200L))));
123125
}
@@ -159,6 +161,7 @@ void elasticsearchIndex() throws IOException {
159161
equalTo(SERVER_PORT, httpHost.getPort()),
160162
equalTo(HTTP_REQUEST_METHOD, "PUT"),
161163
equalTo(NETWORK_PROTOCOL_VERSION, "1.1"),
164+
equalTo(PEER_SERVICE, "test-peer-service"),
162165
equalTo(
163166
URL_FULL,
164167
httpHost.toURI() + "/test-index/_doc/test-id?timeout=10s"),
@@ -220,6 +223,7 @@ void elasticsearchStatusAsync() throws Exception {
220223
equalTo(SERVER_PORT, httpHost.getPort()),
221224
equalTo(HTTP_REQUEST_METHOD, "GET"),
222225
equalTo(NETWORK_PROTOCOL_VERSION, "1.1"),
226+
equalTo(PEER_SERVICE, "test-peer-service"),
223227
equalTo(URL_FULL, httpHost.toURI() + "/"),
224228
equalTo(HTTP_RESPONSE_STATUS_CODE, 200L)),
225229
span ->

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

Lines changed: 3 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;
@@ -117,6 +118,7 @@ void elasticsearchStatus() throws IOException {
117118
equalTo(SERVER_PORT, httpHost.getPort()),
118119
equalTo(HTTP_REQUEST_METHOD, "GET"),
119120
equalTo(NETWORK_PROTOCOL_VERSION, "1.1"),
121+
equalTo(PEER_SERVICE, "test-peer-service"),
120122
equalTo(URL_FULL, httpHost.toURI() + "/_cluster/health"),
121123
equalTo(HTTP_RESPONSE_STATUS_CODE, 200))));
122124

@@ -191,6 +193,7 @@ public void onFailure(Exception e) {
191193
equalTo(SERVER_PORT, httpHost.getPort()),
192194
equalTo(HTTP_REQUEST_METHOD, "GET"),
193195
equalTo(NETWORK_PROTOCOL_VERSION, "1.1"),
196+
equalTo(PEER_SERVICE, "test-peer-service"),
194197
equalTo(URL_FULL, httpHost.toURI() + "/_cluster/health"),
195198
equalTo(HTTP_RESPONSE_STATUS_CODE, 200)),
196199
span ->

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

Lines changed: 3 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;
@@ -107,6 +108,7 @@ void elasticsearchStatus() throws IOException {
107108
equalTo(SERVER_PORT, httpHost.getPort()),
108109
equalTo(HTTP_REQUEST_METHOD, "GET"),
109110
equalTo(NETWORK_PROTOCOL_VERSION, "1.1"),
111+
equalTo(PEER_SERVICE, "test-peer-service"),
110112
equalTo(URL_FULL, httpHost.toURI() + "/_cluster/health"),
111113
equalTo(HTTP_RESPONSE_STATUS_CODE, 200L))));
112114

@@ -181,6 +183,7 @@ public void onFailure(Exception e) {
181183
equalTo(SERVER_PORT, httpHost.getPort()),
182184
equalTo(HTTP_REQUEST_METHOD, "GET"),
183185
equalTo(NETWORK_PROTOCOL_VERSION, "1.1"),
186+
equalTo(PEER_SERVICE, "test-peer-service"),
184187
equalTo(URL_FULL, httpHost.toURI() + "/_cluster/health"),
185188
equalTo(HTTP_RESPONSE_STATUS_CODE, 200)),
186189
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/kubernetes-client-7.0/javaagent/src/version20Test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientVer20Test.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;
@@ -93,6 +94,7 @@ void synchronousCall() throws ApiException {
9394
equalTo(HTTP_RESPONSE_STATUS_CODE, 200),
9495
equalTo(SERVER_ADDRESS, "127.0.0.1"),
9596
equalTo(SERVER_PORT, mockWebServer.httpPort()),
97+
equalTo(PEER_SERVICE, "test-peer-service"),
9698
equalTo(
9799
AttributeKey.stringKey("kubernetes-client.namespace"), "namespace"),
98100
equalTo(AttributeKey.stringKey("kubernetes-client.name"), "name"))));
@@ -141,6 +143,7 @@ void handleErrorsInSyncCall() {
141143
equalTo(SERVER_ADDRESS, "127.0.0.1"),
142144
equalTo(SERVER_PORT, mockWebServer.httpPort()),
143145
equalTo(ERROR_TYPE, "451"),
146+
equalTo(PEER_SERVICE, "test-peer-service"),
144147
equalTo(
145148
AttributeKey.stringKey("kubernetes-client.namespace"), "namespace"),
146149
equalTo(AttributeKey.stringKey("kubernetes-client.name"), "name"))));
@@ -193,6 +196,7 @@ public void onSuccess(
193196
equalTo(HTTP_RESPONSE_STATUS_CODE, 200),
194197
equalTo(SERVER_ADDRESS, "127.0.0.1"),
195198
equalTo(SERVER_PORT, mockWebServer.httpPort()),
199+
equalTo(PEER_SERVICE, "test-peer-service"),
196200
equalTo(
197201
AttributeKey.stringKey("kubernetes-client.namespace"), "namespace"),
198202
equalTo(AttributeKey.stringKey("kubernetes-client.name"), "name")),
@@ -254,6 +258,7 @@ public void onFailure(
254258
equalTo(SERVER_ADDRESS, "127.0.0.1"),
255259
equalTo(SERVER_PORT, mockWebServer.httpPort()),
256260
equalTo(ERROR_TYPE, "451"),
261+
equalTo(PEER_SERVICE, "test-peer-service"),
257262
equalTo(
258263
AttributeKey.stringKey("kubernetes-client.namespace"), "namespace"),
259264
equalTo(AttributeKey.stringKey("kubernetes-client.name"), "name")),

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

Lines changed: 7 additions & 4 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
@@ -180,9 +182,10 @@ void testExceptionInsideTheConnectionFuture() {
180182
.hasStatus(StatusData.error())
181183
.hasException(exception)
182184
.hasAttributesSatisfyingExactly(
185+
equalTo(maybeStable(DB_SYSTEM), "redis"),
186+
equalTo(PEER_SERVICE, "test-peer-service"),
183187
equalTo(SERVER_ADDRESS, host),
184-
equalTo(SERVER_PORT, incorrectPort),
185-
equalTo(maybeStable(DB_SYSTEM), "redis"))));
188+
equalTo(SERVER_PORT, incorrectPort))));
186189
}
187190

188191
@Test

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

Lines changed: 7 additions & 4 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
@@ -155,9 +157,10 @@ void testConnectExceptionInsideTheConnectionFuture() {
155157
.hasKind(SpanKind.CLIENT)
156158
.hasStatus(StatusData.error())
157159
.hasAttributesSatisfyingExactly(
160+
equalTo(maybeStable(DB_SYSTEM), "redis"),
161+
equalTo(PEER_SERVICE, "test-peer-service"),
158162
equalTo(SERVER_ADDRESS, host),
159-
equalTo(SERVER_PORT, incorrectPort),
160-
equalTo(maybeStable(DB_SYSTEM), "redis"))
163+
equalTo(SERVER_PORT, incorrectPort))
161164
.hasEventsSatisfyingExactly(
162165
event ->
163166
event

‎instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ClientSslTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_TYPE;
1616
import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
1717
import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
18+
import static io.opentelemetry.semconv.incubating.PeerIncubatingAttributes.PEER_SERVICE;
1819
import static org.assertj.core.api.Assertions.catchThrowable;
1920

2021
import io.netty.bootstrap.Bootstrap;
@@ -98,6 +99,7 @@ public void shouldFailSslHandshake() {
9899
span.hasAttributesSatisfyingExactly(
99100
equalTo(NETWORK_TRANSPORT, "tcp"),
100101
equalTo(NETWORK_TYPE, "ipv4"),
102+
equalTo(PEER_SERVICE, "test-peer-service"),
101103
equalTo(SERVER_ADDRESS, uri.getHost()),
102104
equalTo(SERVER_PORT, uri.getPort()),
103105
equalTo(NETWORK_PEER_PORT, uri.getPort()),
@@ -178,6 +180,7 @@ public void shouldSuccessfullyEstablishSslHandshake() throws Exception {
178180
span.hasAttributesSatisfyingExactly(
179181
equalTo(NETWORK_TRANSPORT, "tcp"),
180182
equalTo(NETWORK_TYPE, "ipv4"),
183+
equalTo(PEER_SERVICE, "test-peer-service"),
181184
equalTo(SERVER_ADDRESS, uri.getHost()),
182185
equalTo(SERVER_PORT, uri.getPort()),
183186
equalTo(NETWORK_PEER_PORT, uri.getPort()),

‎instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ConnectionSpanTest.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.NetworkAttributes.NETWORK_TYPE;
1717
import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
1818
import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
19+
import static io.opentelemetry.semconv.incubating.PeerIncubatingAttributes.PEER_SERVICE;
1920
import static org.assertj.core.api.Assertions.assertThat;
2021
import static org.assertj.core.api.Assertions.catchThrowable;
2122

@@ -108,6 +109,7 @@ void successfulRequest() throws Exception {
108109
span.hasAttributesSatisfyingExactly(
109110
equalTo(NETWORK_TRANSPORT, "tcp"),
110111
equalTo(NETWORK_TYPE, "ipv4"),
112+
equalTo(PEER_SERVICE, "test-peer-service"),
111113
equalTo(SERVER_ADDRESS, uri.getHost()),
112114
equalTo(SERVER_PORT, uri.getPort()),
113115
equalTo(NETWORK_PEER_PORT, uri.getPort()),

0 commit comments

Comments
 (0)