From 81cb8e61db2c3db1ca8f30091f82952b4c27c4a5 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 29 Oct 2021 00:17:35 -0700 Subject: [PATCH] More metrics (#4541) --- .../HttpUrlConnectionSingletons.java | 2 ++ .../ratpack/RatpackTracingBuilder.java | 21 ++++++++++--------- .../restlet/v1_0/RestletTracingBuilder.java | 2 ++ 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionSingletons.java b/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionSingletons.java index e487603da3..d884aaf63e 100644 --- a/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionSingletons.java +++ b/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionSingletons.java @@ -9,6 +9,7 @@ import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.api.instrumenter.PeerServiceAttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor; +import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientMetrics; import io.opentelemetry.instrumentation.api.instrumenter.http.HttpSpanNameExtractor; import java.net.HttpURLConnection; @@ -30,6 +31,7 @@ public class HttpUrlConnectionSingletons { .addAttributesExtractor(httpAttributesExtractor) .addAttributesExtractor(netAttributesExtractor) .addAttributesExtractor(PeerServiceAttributesExtractor.create(netAttributesExtractor)) + .addRequestMetrics(HttpClientMetrics.get()) .newClientInstrumenter(RequestPropertySetter.INSTANCE); } diff --git a/instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackTracingBuilder.java b/instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackTracingBuilder.java index 4051465e4e..91ca9cfc27 100644 --- a/instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackTracingBuilder.java +++ b/instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackTracingBuilder.java @@ -9,8 +9,8 @@ import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.instrumentation.api.config.Config; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder; import io.opentelemetry.instrumentation.api.instrumenter.http.CapturedHttpHeaders; +import io.opentelemetry.instrumentation.api.instrumenter.http.HttpServerMetrics; import io.opentelemetry.instrumentation.api.instrumenter.http.HttpSpanNameExtractor; import io.opentelemetry.instrumentation.api.instrumenter.http.HttpSpanStatusExtractor; import io.opentelemetry.instrumentation.ratpack.internal.RatpackNetAttributesExtractor; @@ -62,15 +62,16 @@ public final class RatpackTracingBuilder { RatpackHttpAttributesExtractor httpAttributes = new RatpackHttpAttributesExtractor(capturedHttpHeaders); - InstrumenterBuilder builder = - Instrumenter.builder( - openTelemetry, INSTRUMENTATION_NAME, HttpSpanNameExtractor.create(httpAttributes)); + Instrumenter instrumenter = + Instrumenter.builder( + openTelemetry, INSTRUMENTATION_NAME, HttpSpanNameExtractor.create(httpAttributes)) + .setSpanStatusExtractor(HttpSpanStatusExtractor.create(httpAttributes)) + .addAttributesExtractor(netAttributes) + .addAttributesExtractor(httpAttributes) + .addAttributesExtractors(additionalExtractors) + .addRequestMetrics(HttpServerMetrics.get()) + .newServerInstrumenter(new RatpackGetter()); - builder.setSpanStatusExtractor(HttpSpanStatusExtractor.create(httpAttributes)); - builder.addAttributesExtractor(netAttributes); - builder.addAttributesExtractor(httpAttributes); - builder.addAttributesExtractors(additionalExtractors); - - return new RatpackTracing(builder.newServerInstrumenter(new RatpackGetter())); + return new RatpackTracing(instrumenter); } } diff --git a/instrumentation/restlet/restlet-1.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_0/RestletTracingBuilder.java b/instrumentation/restlet/restlet-1.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_0/RestletTracingBuilder.java index 37da8ffd27..5d43283557 100644 --- a/instrumentation/restlet/restlet-1.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_0/RestletTracingBuilder.java +++ b/instrumentation/restlet/restlet-1.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_0/RestletTracingBuilder.java @@ -12,6 +12,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor; import io.opentelemetry.instrumentation.api.instrumenter.SpanStatusExtractor; import io.opentelemetry.instrumentation.api.instrumenter.http.CapturedHttpHeaders; +import io.opentelemetry.instrumentation.api.instrumenter.http.HttpServerMetrics; import io.opentelemetry.instrumentation.api.instrumenter.http.HttpSpanNameExtractor; import io.opentelemetry.instrumentation.api.instrumenter.http.HttpSpanStatusExtractor; import io.opentelemetry.instrumentation.api.instrumenter.net.NetServerAttributesExtractor; @@ -76,6 +77,7 @@ public final class RestletTracingBuilder { .addAttributesExtractor(httpAttributesExtractor) .addAttributesExtractor(netAttributesExtractor) .addAttributesExtractors(additionalExtractors) + .addRequestMetrics(HttpServerMetrics.get()) .newServerInstrumenter(new RestletHeadersGetter()); return new RestletTracing(instrumenter);