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

Jump to bottom

Set custom gRPC client/server span name extractor #5244

Merged
merged 8 commits into from
Feb 24, 2022
Merged

Set custom gRPC client/server span name extractor #5244

Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
461c870
Set custom gRPC client/server span name extractor
eugeniyk Jan 26, 2022
4f22154
Fix imports
eugeniyk Jan 26, 2022
f748538
Fix compilation
eugeniyk Jan 27, 2022
d092af4
Fix style rule
eugeniyk Feb 4, 2022
05aac61
Update to use Functions instead
eugeniyk Feb 17, 2022
91ab31d
Fix formatting
eugeniyk Feb 17, 2022
822f805
Merge remote-tracking branch 'origin/main' into add-grpc-name-extract…
eugeniyk Feb 17, 2022
1319c74
Merge remote-tracking branch 'origin/main' into add-grpc-name-extract…
eugeniyk Feb 24, 2022
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
45 changes: 42 additions & 3 deletions .../library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcTracingBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@
import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
import io.opentelemetry.instrumentation.api.instrumenter.PeerServiceAttributesExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetServerAttributesExtractor;
import io.opentelemetry.instrumentation.grpc.v1_6.internal.GrpcNetClientAttributesGetter;
import io.opentelemetry.instrumentation.grpc.v1_6.internal.GrpcNetServerAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Function;
import java.util.stream.Stream;
import javax.annotation.Nullable;

Expand All @@ -30,6 +32,14 @@ public final class GrpcTracingBuilder {
private final OpenTelemetry openTelemetry;
@Nullable private String peerService;

@Nullable
private Function<SpanNameExtractor<GrpcRequest>, ? extends SpanNameExtractor<? super GrpcRequest>>
clientSpanNameExtractorTransformer;

@Nullable
private Function<SpanNameExtractor<GrpcRequest>, ? extends SpanNameExtractor<? super GrpcRequest>>
serverSpanNameExtractorTransformer;

private final List<AttributesExtractor<? super GrpcRequest, ? super Status>>
additionalExtractors = new ArrayList<>();

Expand All @@ -49,9 +59,26 @@ public GrpcTracingBuilder addAttributeExtractor(
return this;
}

/** Sets custom client {@link SpanNameExtractor} via transform function. */
public GrpcTracingBuilder setClientSpanNameExtractor(
Function<SpanNameExtractor<GrpcRequest>, ? extends SpanNameExtractor<? super GrpcRequest>>
clientSpanNameExtractor) {
this.clientSpanNameExtractorTransformer = clientSpanNameExtractor;
return this;
}

/** Sets custom server {@link SpanNameExtractor} via transform function. */
public GrpcTracingBuilder setServerSpanNameExtractor(
Function<SpanNameExtractor<GrpcRequest>, ? extends SpanNameExtractor<? super GrpcRequest>>
serverSpanNameExtractor) {
this.serverSpanNameExtractorTransformer = serverSpanNameExtractor;
return this;
}

/** Sets the {@code peer.service} attribute for http client spans. */
public void setPeerService(String peerService) {
public GrpcTracingBuilder setPeerService(String peerService) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixing existing builder method

this.peerService = peerService;
return this;
}

/**
Expand All @@ -67,10 +94,22 @@ public GrpcTracingBuilder setCaptureExperimentalSpanAttributes(

/** Returns a new {@link GrpcTracing} with the settings of this {@link GrpcTracingBuilder}. */
public GrpcTracing build() {
SpanNameExtractor<GrpcRequest> originalSpanNameExtractor = new GrpcSpanNameExtractor();

SpanNameExtractor<? super GrpcRequest> clientSpanNameExtractor = originalSpanNameExtractor;
if (clientSpanNameExtractorTransformer != null) {
clientSpanNameExtractor = clientSpanNameExtractorTransformer.apply(originalSpanNameExtractor);
}

SpanNameExtractor<? super GrpcRequest> serverSpanNameExtractor = originalSpanNameExtractor;
if (serverSpanNameExtractorTransformer != null) {
serverSpanNameExtractor = serverSpanNameExtractorTransformer.apply(originalSpanNameExtractor);
}

InstrumenterBuilder<GrpcRequest, Status> clientInstrumenterBuilder =
Instrumenter.builder(openTelemetry, INSTRUMENTATION_NAME, new GrpcSpanNameExtractor());
Instrumenter.builder(openTelemetry, INSTRUMENTATION_NAME, clientSpanNameExtractor);
InstrumenterBuilder<GrpcRequest, Status> serverInstrumenterBuilder =
Instrumenter.builder(openTelemetry, INSTRUMENTATION_NAME, new GrpcSpanNameExtractor());
Instrumenter.builder(openTelemetry, INSTRUMENTATION_NAME, serverSpanNameExtractor);

Stream.of(clientInstrumenterBuilder, serverInstrumenterBuilder)
.forEach(
Expand Down