Skip to content

Commit 31b56e4

Browse files
trasktrask
committed
part2
1 parent 4bad1b4 commit 31b56e4

File tree

25 files changed

+79
-73
lines changed

25 files changed

+79
-73
lines changed

‎instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientTelemetryBuilder.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
1313
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
1414
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
15+
import java.util.Collection;
1516
import java.util.List;
16-
import java.util.Set;
1717
import java.util.function.Function;
1818
import org.apache.http.HttpResponse;
1919

@@ -96,10 +96,10 @@ public ApacheHttpClientTelemetryBuilder setCapturedResponseHeaders(List<String>
9696
* not supplement it.
9797
*
9898
* @param knownMethods A set of recognized HTTP request methods.
99-
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set)
99+
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection)
100100
*/
101101
@CanIgnoreReturnValue
102-
public ApacheHttpClientTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
102+
public ApacheHttpClientTelemetryBuilder setKnownMethods(Collection<String> knownMethods) {
103103
builder.setKnownMethods(knownMethods);
104104
return this;
105105
}

‎instrumentation/apache-httpclient/apache-httpclient-5.2/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClient5TelemetryBuilder.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
1313
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
1414
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
15+
import java.util.Collection;
1516
import java.util.List;
1617
import java.util.Set;
1718
import java.util.function.Function;
@@ -83,7 +84,8 @@ public ApacheHttpClient5TelemetryBuilder setCapturedResponseHeaders(
8384
* not supplement it.
8485
*
8586
* @param knownMethods A set of recognized HTTP request methods.
86-
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set)
87+
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection)
88+
* @deprecated Use {@link ApacheHttpClientTelemetryBuilder#setKnownMethods(Collection)} instead.
8789
*/
8890
@CanIgnoreReturnValue
8991
public ApacheHttpClient5TelemetryBuilder setKnownMethods(Set<String> knownMethods) {

‎instrumentation/apache-httpclient/apache-httpclient-5.2/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClientTelemetryBuilder.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
1313
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
1414
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
15+
import java.util.Collection;
1516
import java.util.List;
16-
import java.util.Set;
1717
import java.util.function.Function;
1818
import org.apache.hc.core5.http.HttpResponse;
1919

@@ -81,10 +81,10 @@ public ApacheHttpClientTelemetryBuilder setCapturedResponseHeaders(List<String>
8181
* not supplement it.
8282
*
8383
* @param knownMethods A set of recognized HTTP request methods.
84-
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set)
84+
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection)
8585
*/
8686
@CanIgnoreReturnValue
87-
public ApacheHttpClientTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
87+
public ApacheHttpClientTelemetryBuilder setKnownMethods(Collection<String> knownMethods) {
8888
builder.setKnownMethods(knownMethods);
8989
return this;
9090
}

‎instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaClientTelemetryBuilder.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaInstrumenterBuilderFactory;
1818
import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaInstrumenterBuilderUtil;
1919
import io.opentelemetry.instrumentation.armeria.v1_3.internal.Experimental;
20+
import java.util.Collection;
2021
import java.util.List;
21-
import java.util.Set;
2222
import java.util.function.Function;
2323

2424
public final class ArmeriaClientTelemetryBuilder {
@@ -92,10 +92,10 @@ public ArmeriaClientTelemetryBuilder setCapturedResponseHeaders(List<String> res
9292
* not supplement it.
9393
*
9494
* @param knownMethods A set of recognized HTTP request methods.
95-
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set)
95+
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection)
9696
*/
9797
@CanIgnoreReturnValue
98-
public ArmeriaClientTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
98+
public ArmeriaClientTelemetryBuilder setKnownMethods(Collection<String> knownMethods) {
9999
builder.setKnownMethods(knownMethods);
100100
return this;
101101
}

‎instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaServerTelemetryBuilder.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaInstrumenterBuilderFactory;
1818
import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaInstrumenterBuilderUtil;
1919
import io.opentelemetry.instrumentation.armeria.v1_3.internal.Experimental;
20+
import java.util.Collection;
2021
import java.util.List;
21-
import java.util.Set;
2222
import java.util.function.Function;
2323

2424
public final class ArmeriaServerTelemetryBuilder {
@@ -90,10 +90,10 @@ public ArmeriaServerTelemetryBuilder setCapturedResponseHeaders(List<String> res
9090
* not supplement it.
9191
*
9292
* @param knownMethods A set of recognized HTTP request methods.
93-
* @see HttpServerAttributesExtractorBuilder#setKnownMethods(Set)
93+
* @see HttpServerAttributesExtractorBuilder#setKnownMethods(Collection)
9494
*/
9595
@CanIgnoreReturnValue
96-
public ArmeriaServerTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
96+
public ArmeriaServerTelemetryBuilder setKnownMethods(Collection<String> knownMethods) {
9797
builder.setKnownMethods(knownMethods);
9898
return this;
9999
}

‎instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTelemetryBuilder.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder;
2121
import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaInstrumenterBuilderFactory;
2222
import io.opentelemetry.instrumentation.armeria.v1_3.internal.Experimental;
23+
import java.util.Collection;
2324
import java.util.List;
2425
import java.util.Set;
2526
import java.util.function.Function;
@@ -217,10 +218,10 @@ public ArmeriaTelemetryBuilder setCapturedServerResponseHeaders(List<String> res
217218
* not supplement it.
218219
*
219220
* @param knownMethods A set of recognized HTTP request methods.
220-
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set)
221-
* @see HttpServerAttributesExtractorBuilder#setKnownMethods(Set)
222-
* @deprecated Use {@link ArmeriaClientTelemetryBuilder#setKnownMethods(Set)} and {@link
223-
* ArmeriaServerTelemetryBuilder#setKnownMethods(Set)} instead.
221+
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection)
222+
* @see HttpServerAttributesExtractorBuilder#setKnownMethods(Collection)
223+
* @deprecated Use {@link ArmeriaClientTelemetryBuilder#setKnownMethods(Collection)} and {@link
224+
* ArmeriaServerTelemetryBuilder#setKnownMethods(Collection)} instead.
224225
*/
225226
@Deprecated
226227
@CanIgnoreReturnValue

‎instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7TelemetryBuilder.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import io.opentelemetry.instrumentation.elasticsearch.rest.internal.ElasticsearchRestInstrumenterFactory;
1616
import io.opentelemetry.instrumentation.elasticsearch.rest.internal.ElasticsearchRestRequest;
1717
import java.util.ArrayList;
18+
import java.util.Collection;
1819
import java.util.HashSet;
1920
import java.util.List;
2021
import java.util.Set;
@@ -60,10 +61,10 @@ public ElasticsearchRest7TelemetryBuilder addAttributesExtractor(
6061
* not supplement it.
6162
*
6263
* @param knownMethods A set of recognized HTTP request methods.
63-
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set)
64+
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection)
6465
*/
6566
@CanIgnoreReturnValue
66-
public ElasticsearchRest7TelemetryBuilder setKnownMethods(Set<String> knownMethods) {
67+
public ElasticsearchRest7TelemetryBuilder setKnownMethods(Collection<String> knownMethods) {
6768
this.knownMethods = new HashSet<>(knownMethods);
6869
return this;
6970
}

‎instrumentation/java-http-client/library/src/main/java/io/opentelemetry/instrumentation/httpclient/JavaHttpClientTelemetryBuilder.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
import io.opentelemetry.instrumentation.httpclient.internal.JavaHttpClientInstrumenterBuilderFactory;
1717
import java.net.http.HttpRequest;
1818
import java.net.http.HttpResponse;
19+
import java.util.Collection;
1920
import java.util.List;
20-
import java.util.Set;
2121
import java.util.function.Function;
2222

2323
public final class JavaHttpClientTelemetryBuilder {
@@ -93,10 +93,10 @@ public JavaHttpClientTelemetryBuilder setCapturedResponseHeaders(List<String> re
9393
* not supplement it.
9494
*
9595
* @param knownMethods A set of recognized HTTP request methods.
96-
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set)
96+
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection)
9797
*/
9898
@CanIgnoreReturnValue
99-
public JavaHttpClientTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
99+
public JavaHttpClientTelemetryBuilder setKnownMethods(Collection<String> knownMethods) {
100100
builder.setKnownMethods(knownMethods);
101101
return this;
102102
}

‎instrumentation/jetty-httpclient/jetty-httpclient-12.0/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v12_0/JettyClientTelemetryBuilder.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
1414
import io.opentelemetry.instrumentation.jetty.httpclient.v12_0.internal.Experimental;
1515
import io.opentelemetry.instrumentation.jetty.httpclient.v12_0.internal.JettyHttpClientInstrumenterBuilderFactory;
16+
import java.util.Collection;
1617
import java.util.List;
17-
import java.util.Set;
1818
import java.util.function.Function;
1919
import org.eclipse.jetty.client.HttpClientTransport;
2020
import org.eclipse.jetty.client.Request;
@@ -108,10 +108,10 @@ public JettyClientTelemetryBuilder setCapturedResponseHeaders(List<String> respo
108108
* not supplement it.
109109
*
110110
* @param knownMethods A set of recognized HTTP request methods.
111-
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set)
111+
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection)
112112
*/
113113
@CanIgnoreReturnValue
114-
public JettyClientTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
114+
public JettyClientTelemetryBuilder setKnownMethods(Collection<String> knownMethods) {
115115
builder.setKnownMethods(knownMethods);
116116
return this;
117117
}

‎instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/JettyClientTelemetryBuilder.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
1414
import io.opentelemetry.instrumentation.jetty.httpclient.v9_2.internal.Experimental;
1515
import io.opentelemetry.instrumentation.jetty.httpclient.v9_2.internal.JettyHttpClientInstrumenterBuilderFactory;
16+
import java.util.Collection;
1617
import java.util.List;
17-
import java.util.Set;
1818
import java.util.function.Function;
1919
import org.eclipse.jetty.client.HttpClientTransport;
2020
import org.eclipse.jetty.client.api.Request;
@@ -108,10 +108,10 @@ public JettyClientTelemetryBuilder setCapturedResponseHeaders(List<String> respo
108108
* not supplement it.
109109
*
110110
* @param knownMethods A set of recognized HTTP request methods.
111-
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set)
111+
* @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection)
112112
*/
113113
@CanIgnoreReturnValue
114-
public JettyClientTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
114+
public JettyClientTelemetryBuilder setKnownMethods(Collection<String> knownMethods) {
115115
builder.setKnownMethods(knownMethods);
116116
return this;
117117
}

0 commit comments

Comments
 (0)