Skip to content

Commit

Permalink
part2
Browse files Browse the repository at this point in the history
  • Loading branch information
trask committed Dec 23, 2024
1 parent 2fc435d commit 636032b
Show file tree
Hide file tree
Showing 25 changed files with 79 additions and 73 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.function.Function;
import org.apache.http.HttpResponse;

Expand Down Expand Up @@ -96,10 +96,10 @@ public ApacheHttpClientTelemetryBuilder setCapturedResponseHeaders(List<String>
* not supplement it.
*
* @param knownMethods A set of recognized HTTP request methods.
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set)
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection)
*/
@CanIgnoreReturnValue
public ApacheHttpClientTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
public ApacheHttpClientTelemetryBuilder setKnownMethods(Collection<String> knownMethods) {
builder.setKnownMethods(knownMethods);
return this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.function.Function;
Expand Down Expand Up @@ -83,7 +84,8 @@ public ApacheHttpClient5TelemetryBuilder setCapturedResponseHeaders(
* not supplement it.
*
* @param knownMethods A set of recognized HTTP request methods.
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set)
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection)
* @deprecated Use {@link ApacheHttpClientTelemetryBuilder#setKnownMethods(Collection)} instead.
*/
@CanIgnoreReturnValue
public ApacheHttpClient5TelemetryBuilder setKnownMethods(Set<String> knownMethods) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.function.Function;
import org.apache.hc.core5.http.HttpResponse;

Expand Down Expand Up @@ -81,10 +81,10 @@ public ApacheHttpClientTelemetryBuilder setCapturedResponseHeaders(List<String>
* not supplement it.
*
* @param knownMethods A set of recognized HTTP request methods.
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set)
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection)
*/
@CanIgnoreReturnValue
public ApacheHttpClientTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
public ApacheHttpClientTelemetryBuilder setKnownMethods(Collection<String> knownMethods) {
builder.setKnownMethods(knownMethods);
return this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaInstrumenterBuilderFactory;
import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaInstrumenterBuilderUtil;
import io.opentelemetry.instrumentation.armeria.v1_3.internal.Experimental;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.function.Function;

public final class ArmeriaClientTelemetryBuilder {
Expand Down Expand Up @@ -92,10 +92,10 @@ public ArmeriaClientTelemetryBuilder setCapturedResponseHeaders(List<String> res
* not supplement it.
*
* @param knownMethods A set of recognized HTTP request methods.
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set)
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection)
*/
@CanIgnoreReturnValue
public ArmeriaClientTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
public ArmeriaClientTelemetryBuilder setKnownMethods(Collection<String> knownMethods) {
builder.setKnownMethods(knownMethods);
return this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaInstrumenterBuilderFactory;
import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaInstrumenterBuilderUtil;
import io.opentelemetry.instrumentation.armeria.v1_3.internal.Experimental;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.function.Function;

public final class ArmeriaServerTelemetryBuilder {
Expand Down Expand Up @@ -90,10 +90,10 @@ public ArmeriaServerTelemetryBuilder setCapturedResponseHeaders(List<String> res
* not supplement it.
*
* @param knownMethods A set of recognized HTTP request methods.
* @see HttpServerAttributesExtractorBuilder#setKnownMethods(Set)
* @see HttpServerAttributesExtractorBuilder#setKnownMethods(Collection)
*/
@CanIgnoreReturnValue
public ArmeriaServerTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
public ArmeriaServerTelemetryBuilder setKnownMethods(Collection<String> knownMethods) {
builder.setKnownMethods(knownMethods);
return this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder;
import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaInstrumenterBuilderFactory;
import io.opentelemetry.instrumentation.armeria.v1_3.internal.Experimental;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.function.Function;
Expand Down Expand Up @@ -217,10 +218,10 @@ public ArmeriaTelemetryBuilder setCapturedServerResponseHeaders(List<String> res
* not supplement it.
*
* @param knownMethods A set of recognized HTTP request methods.
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set)
* @see HttpServerAttributesExtractorBuilder#setKnownMethods(Set)
* @deprecated Use {@link ArmeriaClientTelemetryBuilder#setKnownMethods(Set)} and {@link
* ArmeriaServerTelemetryBuilder#setKnownMethods(Set)} instead.
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection)
* @see HttpServerAttributesExtractorBuilder#setKnownMethods(Collection)
* @deprecated Use {@link ArmeriaClientTelemetryBuilder#setKnownMethods(Collection)} and {@link
* ArmeriaServerTelemetryBuilder#setKnownMethods(Collection)} instead.
*/
@Deprecated
@CanIgnoreReturnValue
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import io.opentelemetry.instrumentation.elasticsearch.rest.internal.ElasticsearchRestInstrumenterFactory;
import io.opentelemetry.instrumentation.elasticsearch.rest.internal.ElasticsearchRestRequest;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
Expand Down Expand Up @@ -60,10 +61,10 @@ public ElasticsearchRest7TelemetryBuilder addAttributesExtractor(
* not supplement it.
*
* @param knownMethods A set of recognized HTTP request methods.
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set)
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection)
*/
@CanIgnoreReturnValue
public ElasticsearchRest7TelemetryBuilder setKnownMethods(Set<String> knownMethods) {
public ElasticsearchRest7TelemetryBuilder setKnownMethods(Collection<String> knownMethods) {
this.knownMethods = new HashSet<>(knownMethods);
return this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
import io.opentelemetry.instrumentation.httpclient.internal.JavaHttpClientInstrumenterBuilderFactory;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.function.Function;

public final class JavaHttpClientTelemetryBuilder {
Expand Down Expand Up @@ -93,10 +93,10 @@ public JavaHttpClientTelemetryBuilder setCapturedResponseHeaders(List<String> re
* not supplement it.
*
* @param knownMethods A set of recognized HTTP request methods.
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set)
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection)
*/
@CanIgnoreReturnValue
public JavaHttpClientTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
public JavaHttpClientTelemetryBuilder setKnownMethods(Collection<String> knownMethods) {
builder.setKnownMethods(knownMethods);
return this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
import io.opentelemetry.instrumentation.jetty.httpclient.v12_0.internal.Experimental;
import io.opentelemetry.instrumentation.jetty.httpclient.v12_0.internal.JettyHttpClientInstrumenterBuilderFactory;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.function.Function;
import org.eclipse.jetty.client.HttpClientTransport;
import org.eclipse.jetty.client.Request;
Expand Down Expand Up @@ -108,10 +108,10 @@ public JettyClientTelemetryBuilder setCapturedResponseHeaders(List<String> respo
* not supplement it.
*
* @param knownMethods A set of recognized HTTP request methods.
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set)
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection)
*/
@CanIgnoreReturnValue
public JettyClientTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
public JettyClientTelemetryBuilder setKnownMethods(Collection<String> knownMethods) {
builder.setKnownMethods(knownMethods);
return this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
import io.opentelemetry.instrumentation.jetty.httpclient.v9_2.internal.Experimental;
import io.opentelemetry.instrumentation.jetty.httpclient.v9_2.internal.JettyHttpClientInstrumenterBuilderFactory;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.function.Function;
import org.eclipse.jetty.client.HttpClientTransport;
import org.eclipse.jetty.client.api.Request;
Expand Down Expand Up @@ -108,10 +108,10 @@ public JettyClientTelemetryBuilder setCapturedResponseHeaders(List<String> respo
* not supplement it.
*
* @param knownMethods A set of recognized HTTP request methods.
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set)
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection)
*/
@CanIgnoreReturnValue
public JettyClientTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
public JettyClientTelemetryBuilder setKnownMethods(Collection<String> knownMethods) {
builder.setKnownMethods(knownMethods);
return this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class KtorServerTelemetry private constructor(
builder.setCapturedResponseHeaders(responseHeaders)
}

fun setKnownMethods(knownMethods: Set<String>) {
fun setKnownMethods(knownMethods: Collection<String>) {
builder.setKnownMethods(knownMethods)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
import io.opentelemetry.instrumentation.netty.v4.common.internal.client.NettyClientInstrumenterFactory;
import io.opentelemetry.instrumentation.netty.v4.common.internal.client.NettyConnectionInstrumentationFlag;
import io.opentelemetry.instrumentation.netty.v4_1.internal.Experimental;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.function.Function;

/** A builder of {@link NettyClientTelemetry}. */
Expand Down Expand Up @@ -98,10 +98,10 @@ public NettyClientTelemetryBuilder addAttributesExtractor(
* not supplement it.
*
* @param knownMethods A set of recognized HTTP request methods.
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set)
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection)
*/
@CanIgnoreReturnValue
public NettyClientTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
public NettyClientTelemetryBuilder setKnownMethods(Collection<String> knownMethods) {
builder.setKnownMethods(knownMethods);
return this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
import io.opentelemetry.instrumentation.netty.v4_1.internal.Experimental;
import io.opentelemetry.instrumentation.netty.v4_1.internal.ProtocolEventHandler;
import io.opentelemetry.instrumentation.netty.v4_1.internal.server.NettyServerInstrumenterBuilderUtil;
import java.util.Collection;
import java.util.List;
import java.util.Set;

/** A builder of {@link NettyServerTelemetry}. */
public final class NettyServerTelemetryBuilder {
Expand Down Expand Up @@ -92,10 +92,10 @@ public NettyServerTelemetryBuilder setCapturedResponseHeaders(
* not supplement it.
*
* @param knownMethods A set of recognized HTTP request methods.
* @see HttpServerAttributesExtractorBuilder#setKnownMethods(Set)
* @see HttpServerAttributesExtractorBuilder#setKnownMethods(Collection)
*/
@CanIgnoreReturnValue
public NettyServerTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
public NettyServerTelemetryBuilder setKnownMethods(Collection<String> knownMethods) {
builder.setKnownMethods(knownMethods);
return this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
import io.opentelemetry.instrumentation.okhttp.v3_0.internal.Experimental;
import io.opentelemetry.instrumentation.okhttp.v3_0.internal.OkHttpClientInstrumenterBuilderFactory;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.function.Function;
import okhttp3.Interceptor;
import okhttp3.Response;
Expand Down Expand Up @@ -93,10 +93,10 @@ public OkHttpTelemetryBuilder setCapturedResponseHeaders(List<String> responseHe
* not supplement it.
*
* @param knownMethods A set of recognized HTTP request methods.
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set)
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection)
*/
@CanIgnoreReturnValue
public OkHttpTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
public OkHttpTelemetryBuilder setKnownMethods(Collection<String> knownMethods) {
builder.setKnownMethods(knownMethods);
return this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
import io.opentelemetry.instrumentation.ratpack.v1_7.internal.Experimental;
import io.opentelemetry.instrumentation.ratpack.v1_7.internal.RatpackClientInstrumenterBuilderFactory;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.function.Function;
import ratpack.http.client.HttpResponse;
import ratpack.http.client.RequestSpec;
Expand Down Expand Up @@ -75,10 +75,10 @@ public RatpackClientTelemetryBuilder setCapturedResponseHeaders(List<String> res
* not supplement it.
*
* @param knownMethods A set of recognized HTTP request methods.
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set)
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection)
*/
@CanIgnoreReturnValue
public RatpackClientTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
public RatpackClientTelemetryBuilder setKnownMethods(Collection<String> knownMethods) {
builder.setKnownMethods(knownMethods);
return this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder;
import io.opentelemetry.instrumentation.ratpack.v1_7.internal.Experimental;
import io.opentelemetry.instrumentation.ratpack.v1_7.internal.RatpackServerInstrumenterBuilderFactory;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.function.Function;
import ratpack.http.Request;
import ratpack.http.Response;
Expand Down Expand Up @@ -79,10 +79,10 @@ public RatpackServerTelemetryBuilder setCapturedResponseHeaders(List<String> res
* not supplement it.
*
* @param knownMethods A set of recognized HTTP request methods.
* @see HttpServerAttributesExtractorBuilder#setKnownMethods(Set)
* @see HttpServerAttributesExtractorBuilder#setKnownMethods(Collection)
*/
@CanIgnoreReturnValue
public RatpackServerTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
public RatpackServerTelemetryBuilder setKnownMethods(Collection<String> knownMethods) {
builder.setKnownMethods(knownMethods);
return this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import io.opentelemetry.instrumentation.ratpack.v1_7.internal.Experimental;
import io.opentelemetry.instrumentation.ratpack.v1_7.internal.RatpackClientInstrumenterBuilderFactory;
import io.opentelemetry.instrumentation.ratpack.v1_7.internal.RatpackServerInstrumenterBuilderFactory;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.function.Function;
Expand Down Expand Up @@ -135,10 +136,10 @@ public RatpackTelemetryBuilder setCapturedClientResponseHeaders(List<String> res
* not supplement it.
*
* @param knownMethods A set of recognized HTTP request methods.
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set)
* @see HttpServerAttributesExtractorBuilder#setKnownMethods(Set)
* @deprecated Use {@link RatpackServerTelemetryBuilder#setKnownMethods(Set)} and {@link
* RatpackClientTelemetryBuilder#setKnownMethods(Set)} instead.
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection)
* @see HttpServerAttributesExtractorBuilder#setKnownMethods(Collection)
* @deprecated Use {@link RatpackServerTelemetryBuilder#setKnownMethods(Collection)} and {@link
* RatpackClientTelemetryBuilder#setKnownMethods(Collection)} instead.
*/
@Deprecated
@CanIgnoreReturnValue
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder;
import io.opentelemetry.instrumentation.restlet.v1_1.internal.Experimental;
import io.opentelemetry.instrumentation.restlet.v1_1.internal.RestletTelemetryBuilderFactory;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.function.Function;
import org.restlet.data.Request;
import org.restlet.data.Response;
Expand Down Expand Up @@ -77,10 +77,10 @@ public RestletTelemetryBuilder setCapturedResponseHeaders(List<String> responseH
* not supplement it.
*
* @param knownMethods A set of recognized HTTP request methods.
* @see HttpServerAttributesExtractorBuilder#setKnownMethods(Set)
* @see HttpServerAttributesExtractorBuilder#setKnownMethods(Collection)
*/
@CanIgnoreReturnValue
public RestletTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
public RestletTelemetryBuilder setKnownMethods(Collection<String> knownMethods) {
builder.setKnownMethods(knownMethods);
return this;
}
Expand Down
Loading

0 comments on commit 636032b

Please sign in to comment.