(chore) class access cleanup from review

Author: johnrengelman

Diff for: instrumentation/ratpack/ratpack-1.7/javaagent/build.gradle.kts

@@ -8,6 +8,11 @@ muzzle {
     module.set("ratpack-core")
     versions.set("[1.7.0,)")
   }
+  fail {
+    group.set("io.ratpack")
+    module.set("ratpack-core")
+    versions.set("[1.0,1.7)")
+  }
 }
 
 dependencies {
@@ -19,18 +24,11 @@ dependencies {
   testLibrary("io.ratpack:ratpack-test:1.7.0")
   testImplementation(project(":instrumentation:ratpack:ratpack-1.4:testing"))
   testInstrumentation(project(":instrumentation:ratpack:ratpack-1.4:javaagent"))
-
-  if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11)) {
-    testImplementation("com.sun.activation:jakarta.activation:1.2.2")
-  }
 }
 
 tasks {
   withType<Test>().configureEach {
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
+    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
   }
 }
-
-tasks.withType<Test>().configureEach {
-  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
-}

Diff for: instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/RatpackInstrumentationModule.java

@@ -38,7 +38,6 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
   public List<TypeInstrumentation> typeInstrumentations() {
     return asList(
         new DefaultExecControllerInstrumentation(),
-        new ServerRegistryInstrumentation(),
         new HttpClientInstrumentation(),
         new RequestActionSupportInstrumentation());
   }

Diff for: instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/ServerRegistryInstrumentation.java

@@ -38,9 +38,8 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
         HttpClientTestOptions.DEFAULT_EXPECTED_CLIENT_SPAN_NAME_MAPPER);
     optionsBuilder.setClientSpanErrorMapper(
         (uri, exception) -> {
-          if (uri.toString().equals("https://192.0.2.1/")) {
-            return new ConnectTimeoutException("Connect timeout (PT2S) connecting to " + uri);
-          } else if (OS.WINDOWS.isCurrentOs() && uri.toString().equals("http://localhost:61/")) {
+          if (uri.toString().equals("https://192.0.2.1/")
+              || (OS.WINDOWS.isCurrentOs() && uri.toString().equals("http://localhost:61/"))) {
             return new ConnectTimeoutException("Connect timeout (PT2S) connecting to " + uri);
           } else if (uri.getPath().equals("/read-timeout")) {
             return new HttpClientReadTimeoutException(

Diff for: instrumentation/ratpack/ratpack-1.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/RatpackPooledHttpClientTest.java

@@ -13,7 +13,7 @@
  * This class is internal and is hence not for public use. Its APIs are unstable and can change at
  * any time.
  */
-public enum RatpackGetter implements TextMapGetter<Request> {
+enum RatpackGetter implements TextMapGetter<Request> {
   INSTANCE;
 
   @Override

Diff for: instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/internal/RatpackGetter.java

@@ -17,7 +17,7 @@
  * This class is internal and is hence not for public use. Its APIs are unstable and can change at
  * any time.
  */
-public enum RatpackHttpAttributesGetter implements HttpServerAttributesGetter<Request, Response> {
+enum RatpackHttpAttributesGetter implements HttpServerAttributesGetter<Request, Response> {
   INSTANCE;
 
   @Override

Diff for: instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/internal/RatpackHttpAttributesGetter.java

@@ -15,7 +15,7 @@
  * This class is internal and is hence not for public use. Its APIs are unstable and can change at
  * any time.
  */
-public enum RatpackHttpClientAttributesGetter
+enum RatpackHttpClientAttributesGetter
     implements HttpClientAttributesGetter<RequestSpec, HttpResponse> {
   INSTANCE;
 

Diff for: instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/internal/RatpackHttpClientAttributesGetter.java

@@ -13,7 +13,7 @@
  * This class is internal and is hence not for public use. Its APIs are unstable and can change at
  * any time.
  */
-public enum RequestHeaderSetter implements TextMapSetter<RequestSpec> {
+enum RequestHeaderSetter implements TextMapSetter<RequestSpec> {
   INSTANCE;
 
   @Override