Rename a couple of methods to 'wrap'

instrumentation/java-http-client/library/README.md

@@ -43,7 +43,7 @@ public class JavaHttpClientConfiguration {
 
   //Use this HttpClient implementation for making standard http client calls.
   public HttpClient createTracedClient(OpenTelemetry openTelemetry) {
-    return JavaHttpClientTelemetry.builder(openTelemetry).build().newHttpClient(createClient());
+    return JavaHttpClientTelemetry.builder(openTelemetry).build().wrap(createClient());
   }
 
   //your configuration of the Java HTTP Client goes here:

instrumentation/java-http-client/library/src/main/java/io/opentelemetry/instrumentation/javahttpclient/JavaHttpClientTelemetry.java

@@ -42,8 +42,15 @@ public static JavaHttpClientTelemetryBuilder builder(OpenTelemetry openTelemetry
    *
    * @param client An instance of HttpClient configured as desired.
    * @return a tracing-enabled {@link HttpClient}.
+   * @deprecated Use {@link #wrap(HttpClient)} instead.
    */
+  @Deprecated
   public HttpClient newHttpClient(HttpClient client) {
+    return wrap(client);
+  }
+
+  /** Returns a new instrumented {@link HttpClient} that wraps the provided client. */
+  public HttpClient wrap(HttpClient client) {
     return new OpenTelemetryHttpClient(client, instrumenter, headersSetter);
   }
 }

instrumentation/java-http-client/library/src/test/java/io/opentelemetry/instrumentation/javahttpclient/JavaHttpClientTest.java

@@ -28,7 +28,7 @@ protected HttpClient configureHttpClient(HttpClient httpClient) {
           .setCapturedResponseHeaders(
               Collections.singletonList(AbstractHttpClientTest.TEST_RESPONSE_HEADER))
           .build()
-          .newHttpClient(httpClient);
+          .wrap(httpClient);
     }
   }
 

instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/HttpClientInstrumentation.java

@@ -40,7 +40,7 @@ public static class OfAdvice {
     @Advice.OnMethodExit(suppress = Throwable.class)
     @Advice.AssignReturned.ToReturned
     public static HttpClient injectTracing(@Advice.Return HttpClient httpClient) throws Exception {
-      return RatpackSingletons.httpClient().instrument(httpClient);
+      return RatpackSingletons.httpClient().wrap(httpClient);
     }
   }
 }

instrumentation/ratpack/ratpack-1.7/library/README.md

@@ -55,7 +55,7 @@ public class RatpackConfiguration {
   // Create an instrumented HttpClient
   public HttpClient createTracedClient(OpenTelemetry openTelemetry) {
     RatpackClientTelemetry clientTelemetry = RatpackClientTelemetry.create(openTelemetry);
-    return clientTelemetry.instrument(createClient());
+    return clientTelemetry.wrap(createClient());
   }
 
   // Configuration of the HttpClient goes here

instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackClientTelemetry.java

@@ -16,13 +16,13 @@
  * Entrypoint for instrumenting Ratpack http client.
  *
  * <p>To apply OpenTelemetry instrumentation to a http client, wrap the {@link HttpClient} using
- * {@link #instrument(HttpClient)}.
+ * {@link #wrap(HttpClient)}.
  *
  * <pre>{@code
  * RatpackClientTelemetry telemetry = RatpackClientTelemetry.create(OpenTelemetrySdk.builder()
  *   ...
  *   .build());
- * HttpClient instrumentedHttpClient = telemetry.instrument(httpClient);
+ * HttpClient instrumentedHttpClient = telemetry.wrap(httpClient);
  * }</pre>
  */
 public final class RatpackClientTelemetry {
@@ -48,8 +48,18 @@ public static RatpackClientTelemetryBuilder builder(OpenTelemetry openTelemetry)
     httpClientInstrumenter = new OpenTelemetryHttpClient(clientInstrumenter);
   }
 
-  /** Returns instrumented instance of {@link HttpClient} with OpenTelemetry. */
+  /**
+   * Returns instrumented instance of {@link HttpClient} with OpenTelemetry.
+   *
+   * @deprecated Use {@link #wrap(HttpClient)} instead.
+   */
+  @Deprecated
   public HttpClient instrument(HttpClient httpClient) throws Exception {
-    return httpClientInstrumenter.instrument(httpClient);
+    return wrap(httpClient);
+  }
+
+  /** Returns a new instrumented {@link HttpClient} that wraps the provided client. */
+  public HttpClient wrap(HttpClient httpClient) throws Exception {
+    return httpClientInstrumenter.wrap(httpClient);
   }
 }

instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/internal/OpenTelemetryHttpClient.java

@@ -26,7 +26,7 @@ public OpenTelemetryHttpClient(Instrumenter<RequestSpec, HttpResponse> instrumen
     this.instrumenter = instrumenter;
   }
 
-  public HttpClient instrument(HttpClient httpClient) throws Exception {
+  public HttpClient wrap(HttpClient httpClient) throws Exception {
     return httpClient.copyWith(
         httpClientSpec -> {
           httpClientSpec.requestIntercept(

instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackHttpClientTest.java

@@ -27,12 +27,11 @@ protected HttpClient buildHttpClient() throws Exception {
         .setCapturedResponseHeaders(
             Collections.singletonList(AbstractHttpClientTest.TEST_RESPONSE_HEADER))
         .build()
-        .instrument(HttpClient.of(Action.noop()));
+        .wrap(HttpClient.of(Action.noop()));
   }
 
   @Override
   protected HttpClient buildHttpClient(Action<? super HttpClientSpec> action) throws Exception {
-    return RatpackClientTelemetry.create(testing.getOpenTelemetry())
-        .instrument(HttpClient.of(action));
+    return RatpackClientTelemetry.create(testing.getOpenTelemetry()).wrap(HttpClient.of(action));
   }
 }

instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/client/InstrumentedHttpClientTest.java

@@ -77,8 +77,7 @@ void testPropagateTraceWithHttpCalls() throws Exception {
                       bindings -> {
                         serverTelemetry.configureRegistry(bindings);
                         bindings.bindInstance(
-                            HttpClient.class,
-                            clientTelemetry.instrument(HttpClient.of(Action.noop())));
+                            HttpClient.class, clientTelemetry.wrap(HttpClient.of(Action.noop())));
                       }));
 
               spec.handlers(
@@ -160,8 +159,7 @@ void testAddSpansForMultipleConcurrentClientCalls() throws Exception {
                       bindings -> {
                         serverTelemetry.configureRegistry(bindings);
                         bindings.bindInstance(
-                            HttpClient.class,
-                            clientTelemetry.instrument(HttpClient.of(Action.noop())));
+                            HttpClient.class, clientTelemetry.wrap(HttpClient.of(Action.noop())));
                       }));
 
               spec.handlers(
@@ -250,7 +248,7 @@ void testHandlingExceptionErrorsInHttpClient() throws Exception {
                         serverTelemetry.configureRegistry(bindings);
                         bindings.bindInstance(
                             HttpClient.class,
-                            clientTelemetry.instrument(
+                            clientTelemetry.wrap(
                                 HttpClient.of(s -> s.readTimeout(Duration.ofMillis(10)))));
                       }));
 
@@ -323,8 +321,7 @@ void propagateHttpTraceInRatpackServicesWithForkExecutions(
                       bindings -> {
                         serverTelemetry.configureRegistry(bindings);
                         bindings.bindInstance(
-                            HttpClient.class,
-                            clientTelemetry.instrument(HttpClient.of(Action.noop())));
+                            HttpClient.class, clientTelemetry.wrap(HttpClient.of(Action.noop())));
                         bindings.bindInstance(
                             serviceClass
                                 .getConstructor(String.class, InstrumentationExtension.class)

instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/OpenTelemetryModule.java

@@ -56,7 +56,7 @@ static ExecInterceptor ratpackExecInterceptor(RatpackServerTelemetry ratpackTrac
   @Singleton
   @Provides
   static HttpClient instrumentedHttpClient(RatpackClientTelemetry ratpackTracing) throws Exception {
-    return ratpackTracing.instrument(HttpClient.of(spec -> {}));
+    return ratpackTracing.wrap(HttpClient.of(spec -> {}));
   }
 
   @Singleton