Deprecate NetServerAttributesExtractor
#9156
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.instrumentation.api.instrumenter.network; | ||
|
|
||
| import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; | ||
| import static java.util.Collections.emptyMap; | ||
| import static org.assertj.core.api.Assertions.entry; | ||
|
|
||
| import io.opentelemetry.api.common.Attributes; | ||
| import io.opentelemetry.api.common.AttributesBuilder; | ||
| import io.opentelemetry.context.Context; | ||
| import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; | ||
| import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
| import javax.annotation.Nullable; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| class ClientAttributesExtractorOldSemconvTest { | ||
|
|
||
| static class TestClientAttributesGetter | ||
| implements ClientAttributesGetter<Map<String, String>, Void> { | ||
|
|
||
| @Nullable | ||
| @Override | ||
| public String getClientAddress(Map<String, String> request) { | ||
| return request.get("address"); | ||
| } | ||
|
|
||
| @Nullable | ||
| @Override | ||
| public Integer getClientPort(Map<String, String> request) { | ||
| String value = request.get("port"); | ||
| return value == null ? null : Integer.parseInt(value); | ||
| } | ||
|
|
||
| @Nullable | ||
| @Override | ||
| public String getClientSocketAddress(Map<String, String> request, @Nullable Void response) { | ||
| return request.get("socketAddress"); | ||
| } | ||
|
|
||
| @Nullable | ||
| @Override | ||
| public Integer getClientSocketPort(Map<String, String> request, @Nullable Void response) { | ||
| String value = request.get("socketPort"); | ||
| return value == null ? null : Integer.parseInt(value); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| void allAttributes() { | ||
| Map<String, String> request = new HashMap<>(); | ||
| request.put("address", "opentelemetry.io"); | ||
| request.put("port", "80"); | ||
| request.put("socketAddress", "1.2.3.4"); | ||
| request.put("socketPort", "8080"); | ||
|
|
||
| AttributesExtractor<Map<String, String>, Void> extractor = | ||
| ClientAttributesExtractor.create(new TestClientAttributesGetter()); | ||
|
|
||
| AttributesBuilder startAttributes = Attributes.builder(); | ||
| extractor.onStart(startAttributes, Context.root(), request); | ||
| assertThat(startAttributes.build()) | ||
| .containsOnly(entry(SemanticAttributes.HTTP_CLIENT_IP, "opentelemetry.io")); | ||
|
|
||
| AttributesBuilder endAttributes = Attributes.builder(); | ||
| extractor.onEnd(endAttributes, Context.root(), request, null, null); | ||
| assertThat(endAttributes.build()) | ||
| .containsOnly( | ||
| entry(SemanticAttributes.NET_SOCK_PEER_ADDR, "1.2.3.4"), | ||
| entry(SemanticAttributes.NET_SOCK_PEER_PORT, 8080L)); | ||
| } | ||
|
|
||
| @Test | ||
| void noAttributes() { | ||
| AttributesExtractor<Map<String, String>, Void> extractor = | ||
| ClientAttributesExtractor.create(new TestClientAttributesGetter()); | ||
|
|
||
| AttributesBuilder startAttributes = Attributes.builder(); | ||
| extractor.onStart(startAttributes, Context.root(), emptyMap()); | ||
| assertThat(startAttributes.build()).isEmpty(); | ||
|
|
||
| AttributesBuilder endAttributes = Attributes.builder(); | ||
| extractor.onEnd(endAttributes, Context.root(), emptyMap(), null, null); | ||
| assertThat(endAttributes.build()).isEmpty(); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't understand why you removed the import and just use the lengthy package name below. You did this in several places, so it looks intentional....it's just not clear to me how/why this helps the deprecation effort.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Errorprone requires that when you use deprecated types.
I don't like this either, but I can kinda agree with that: using deprecated classes should look ugly, to encourage you to refactor the code that uses them