Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating Sockpeer service. #7888

Merged
merged 17 commits into from
Apr 28, 2023
Merged

Updating Sockpeer service. #7888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
0785dc4
Updating Sockpeer service.
rahuldimri Feb 23, 2023
1965b6f
added test cases
rahuldimri Mar 13, 2023
f1dd0fc
Syntax error
rahuldimri Mar 20, 2023
1846f0f
syntax error
rahuldimri Mar 20, 2023
bca6899
SocketPeer
rahuldimri Mar 20, 2023
caebf27
Syntax error
rahuldimri Mar 20, 2023
8704d36
syntax error
rahuldimri Mar 20, 2023
1d44c92
spotless
rahuldimri Mar 20, 2023
30611dd
format
rahuldimri Mar 21, 2023
0e46923
test
rahuldimri Mar 24, 2023
ce23719
Update instrumentation-api-semconv/src/main/java/io/opentelemetry/ins…
rahuldimri Apr 17, 2023
ec41ae7
code review: closing bracket
rahuldimri Apr 27, 2023
8dcbe10
Update instrumentation-api-semconv/src/main/java/io/opentelemetry/ins…
rahuldimri Apr 27, 2023
6b0dc34
Update instrumentation-api-semconv/src/test/java/io/opentelemetry/ins…
rahuldimri Apr 27, 2023
607db5f
Update instrumentation-api-semconv/src/test/java/io/opentelemetry/ins…
rahuldimri Apr 27, 2023
fa940a3
Update PeerServiceAttributesExtractorTest.java
rahuldimri Apr 28, 2023
43203a9
formatting changes
rahuldimri Apr 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...io/opentelemetry/instrumentation/api/instrumenter/net/PeerServiceAttributesExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ public void onEnd(

String peerName = attributesGetter.getPeerName(request);
String peerService = mapToPeerService(peerName);
if (peerService == null) {
String sockPeerName = attributesGetter.getSockPeerName(request, response);
peerService = mapToPeerService(sockPeerName);
}
if (peerService != null) {
attributes.put(SemanticAttributes.PEER_SERVICE, peerService);
}
Expand Down
29 changes: 29 additions & 0 deletions ...pentelemetry/instrumentation/api/instrumenter/net/PeerServiceAttributesExtractorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import static org.assertj.core.api.Assertions.entry;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import io.opentelemetry.api.common.Attributes;
Expand Down Expand Up @@ -89,6 +91,33 @@ void shouldSetPeerNameIfItMatches() {
AttributesBuilder endAttributes = Attributes.builder();
underTest.onEnd(endAttributes, context, "request", "response", null);

// then
assertThat(startAttributes.build()).isEmpty();
assertThat(endAttributes.build())
.containsOnly(entry(SemanticAttributes.PEER_SERVICE, "myService"));
verify(netAttributesExtractor, never()).getSockPeerName(any(), any());
}

@Test
void shouldSetSockPeerNameIfItMatchesAndNoPeerNameProvided() {
// given
Map<String, String> peerServiceMapping = new HashMap<>();
peerServiceMapping.put("example.com", "myService");
peerServiceMapping.put("1.2.3.4", "someOtherService");

PeerServiceAttributesExtractor<String, String> underTest =
new PeerServiceAttributesExtractor<>(netAttributesExtractor, peerServiceMapping);

when(netAttributesExtractor.getSockPeerName(any(), any())).thenReturn("example.com");

Context context = Context.root();

// when
AttributesBuilder startAttributes = Attributes.builder();
underTest.onStart(startAttributes, context, "request");
AttributesBuilder endAttributes = Attributes.builder();
underTest.onEnd(endAttributes, context, "request", "response", null);

// then
assertThat(startAttributes.build()).isEmpty();
assertThat(endAttributes.build())
Expand Down