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.

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

Split ArmeriaTelemetry into client and server #12851

Merged
merged 11 commits into from
Dec 11, 2024

Conversation

trask
Copy link
Member

@trask trask commented Dec 8, 2024

ArmeriaTelemetry* classes have been deprecated and split into ArmeriaClientTelemetry* and ArmeriaServerTelemetry*

Part of #12846

See #12867 for change log migration notes entry

@github-actions github-actions bot added the test native This label can be applied to PRs to trigger them to run native tests label Dec 8, 2024
@trask trask force-pushed the split-armeria branch 3 times, most recently from 71e277c to 4c95169 Compare December 9, 2024 00:45
@trask trask force-pushed the split-armeria branch 3 times, most recently from ed75537 to 624a400 Compare December 9, 2024 04:37
@trask trask marked this pull request as ready for review December 9, 2024 05:45
@trask trask requested a review from a team as a code owner December 9, 2024 05:45
import java.util.function.Function;

/** Entrypoint for instrumenting Armeria clients. */
public final class ArmeriaClientTelemetry {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ktor has server and client instrumentations in separate packages, should we do the same here or change ktor?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good question... 🤔

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since they're small packages and we'd probably want to keep "Client" and "Server" in the class names not to conflict anyways, I think I'm leaning towards single package (and changing ktor)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

one benefit for having a single package could be that when you initially have only server instrumentation, like in ktor-1, then adding client instrumentation wouldn't force changing the package (unless the author had the foresight to use the correct package from the start).

@@ -21,13 +21,13 @@ class ArmeriaHttpClientTest extends AbstractArmeriaHttpClientTest {
@Override
protected WebClientBuilder configureClient(WebClientBuilder clientBuilder) {
return clientBuilder.decorator(
ArmeriaTelemetry.builder(testing.getOpenTelemetry())
.setCapturedClientRequestHeaders(
ArmeriaClientTelemetry.builder(testing.getOpenTelemetry())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WDYT should we also have a test for the deprecated telemetry class?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sounds reasonable, I'll make a copy

@trask trask merged commit 1381f16 into open-telemetry:main Dec 11, 2024
56 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
test native This label can be applied to PRs to trigger them to run native tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants