Less surprising behavior (#4349)

* Less surprising behavior

instrumentation/aws-lambda-1.0/javaagent/src/test/groovy/io/opentelemetry/test/AwsLambdaSqsHandlerTest.groovy → instrumentation/aws-lambda-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awslambda/v1_0/AwsLambdaSqsHandlerTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.test
+package io.opentelemetry.javaagent.instrumentation.awslambda.v1_0
 
 import com.amazonaws.services.lambda.runtime.Context
 import com.amazonaws.services.lambda.runtime.RequestHandler
@@ -11,10 +11,6 @@ import com.amazonaws.services.lambda.runtime.events.SQSEvent
 import io.opentelemetry.instrumentation.awslambda.v1_0.AbstractAwsLambdaSqsHandlerTest
 import io.opentelemetry.instrumentation.test.AgentTestTrait
 
-/**
- * Note: this has to stay outside of 'io.opentelemetry.javaagent' package to be considered for
- * instrumentation
- */
 class AwsLambdaSqsHandlerTest extends AbstractAwsLambdaSqsHandlerTest implements AgentTestTrait {
 
   static class TestRequestHandler implements RequestHandler<SQSEvent, Void> {

instrumentation/aws-lambda-1.0/javaagent/src/test/groovy/io/opentelemetry/test/AwsLambdaTest.groovy → instrumentation/aws-lambda-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awslambda/v1_0/AwsLambdaTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.test
+package io.opentelemetry.javaagent.instrumentation.awslambda.v1_0
 
 import com.amazonaws.services.lambda.runtime.Context
 import com.amazonaws.services.lambda.runtime.RequestHandler
@@ -11,10 +11,6 @@ import io.opentelemetry.instrumentation.awslambda.v1_0.AbstractAwsLambdaRequestH
 import io.opentelemetry.instrumentation.test.AgentTestTrait
 import io.opentelemetry.javaagent.testing.common.AgentTestingExporterAccess
 
-/**
- * Note: this has to stay outside of 'io.opentelemetry.javaagent' package to be considered for
- * instrumentation
- */
 class AwsLambdaTest extends AbstractAwsLambdaRequestHandlerTest implements AgentTestTrait {
 
   def cleanup() {

instrumentation/jaxws/jaxws-2.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/JaxWsAnnotationsTest.groovy

@@ -7,7 +7,6 @@ package io.opentelemetry.javaagent.instrumentation.jaxws.v2_0
 
 import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
-import io.opentelemetry.test.SoapProvider
 
 class JaxWsAnnotationsTest extends AgentInstrumentationSpecification {
 
@@ -21,7 +20,7 @@ class JaxWsAnnotationsTest extends AgentInstrumentationSpecification {
         span(0) {
           name "SoapProvider.invoke"
           attributes {
-            "${SemanticAttributes.CODE_NAMESPACE.key}" "io.opentelemetry.test.SoapProvider"
+            "${SemanticAttributes.CODE_NAMESPACE.key}" "io.opentelemetry.javaagent.instrumentation.jaxws.v2_0.SoapProvider"
             "${SemanticAttributes.CODE_FUNCTION.key}" "invoke"
           }
         }

instrumentation/jaxws/jaxws-2.0/javaagent/src/test/java/io/opentelemetry/test/SoapProvider.java → instrumentation/jaxws/jaxws-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/SoapProvider.java

@@ -3,14 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.test;
+package io.opentelemetry.javaagent.instrumentation.jaxws.v2_0;
 
 import javax.xml.ws.Provider;
 
-/**
- * Note: this has to stay outside of 'io.opentelemetry.javaagent' package to be considered for
- * instrumentation
- */
 public class SoapProvider implements Provider<SoapProvider.Message> {
 
   @Override

instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsAnnotationsTest.groovy

@@ -7,9 +7,6 @@ package io.opentelemetry.javaagent.instrumentation.jaxws.jws.v1_1
 
 import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
-import io.opentelemetry.test.WebServiceClass
-import io.opentelemetry.test.WebServiceDefinitionInterface
-import io.opentelemetry.test.WebServiceFromInterface
 
 import java.lang.reflect.Proxy
 
@@ -27,7 +24,7 @@ class JwsAnnotationsTest extends AgentInstrumentationSpecification {
         span(0) {
           name "WebServiceClass.doSomethingPublic"
           attributes {
-            "${SemanticAttributes.CODE_NAMESPACE.key}" "io.opentelemetry.test.WebServiceClass"
+            "${SemanticAttributes.CODE_NAMESPACE.key}" "io.opentelemetry.javaagent.instrumentation.jaxws.jws.v1_1.WebServiceClass"
             "${SemanticAttributes.CODE_FUNCTION.key}" "doSomethingPublic"
           }
         }
@@ -47,7 +44,7 @@ class JwsAnnotationsTest extends AgentInstrumentationSpecification {
         span(0) {
           name "WebServiceFromInterface.partOfPublicInterface"
           attributes {
-            "${SemanticAttributes.CODE_NAMESPACE.key}" "io.opentelemetry.test.WebServiceFromInterface"
+            "${SemanticAttributes.CODE_NAMESPACE.key}" "io.opentelemetry.javaagent.instrumentation.jaxws.jws.v1_1.WebServiceFromInterface"
             "${SemanticAttributes.CODE_FUNCTION.key}" "partOfPublicInterface"
           }
         }
@@ -71,7 +68,7 @@ class JwsAnnotationsTest extends AgentInstrumentationSpecification {
         span(0) {
           name "WebServiceFromInterface.partOfPublicInterface"
           attributes {
-            "${SemanticAttributes.CODE_NAMESPACE.key}" "io.opentelemetry.test.WebServiceFromInterface"
+            "${SemanticAttributes.CODE_NAMESPACE.key}" "io.opentelemetry.javaagent.instrumentation.jaxws.jws.v1_1.WebServiceFromInterface"
             "${SemanticAttributes.CODE_FUNCTION.key}" "partOfPublicInterface"
           }
         }

instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/ProxyInvocationHandler.java

@@ -5,8 +5,6 @@
 
 package io.opentelemetry.javaagent.instrumentation.jaxws.jws.v1_1;
 
-import io.opentelemetry.test.WebServiceDefinitionInterface;
-import io.opentelemetry.test.WebServiceFromInterface;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 

instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/java/io/opentelemetry/test/WebServiceClass.java → instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/WebServiceClass.java

@@ -3,14 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.test;
+package io.opentelemetry.javaagent.instrumentation.jaxws.jws.v1_1;
 
 import javax.jws.WebService;
 
-/**
- * Note: this has to stay outside of 'io.opentelemetry.javaagent' package to be considered for
- * instrumentation
- */
 // This is pure java to not have any groovy generated public method surprises
 @WebService
 public class WebServiceClass {

instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/java/io/opentelemetry/test/WebServiceDefinitionInterface.java → instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/WebServiceDefinitionInterface.java

@@ -3,14 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.test;
+package io.opentelemetry.javaagent.instrumentation.jaxws.jws.v1_1;
 
 import javax.jws.WebService;
 
-/**
- * Note: this has to stay outside of 'io.opentelemetry.javaagent' package to be considered for
- * instrumentation
- */
 @WebService
 public interface WebServiceDefinitionInterface {
   void partOfPublicInterface();

instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/java/io/opentelemetry/test/WebServiceFromInterface.java → instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/WebServiceFromInterface.java

@@ -3,12 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.test;
+package io.opentelemetry.javaagent.instrumentation.jaxws.jws.v1_1;
 
-/**
- * Note: this has to stay outside of 'io.opentelemetry.javaagent' package to be considered for
- * instrumentation
- */
 public class WebServiceFromInterface implements WebServiceDefinitionInterface {
   @Override
   public void partOfPublicInterface() {}

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/GlobalIgnoredTypesConfigurer.java

@@ -55,7 +55,14 @@ public class GlobalIgnoredTypesConfigurer implements IgnoredTypesConfigurer {
     // clojure
     builder.ignoreClass("clojure.").ignoreClass("$fn__");
 
-    builder.ignoreClass("io.opentelemetry.javaagent.");
+    // all classes in the AgentClassLoader are ignored separately
+    // this is used to ignore agent classes that are in the bootstrap class loader
+    // the reason not to use "io.opentelemetry.javaagent." is so that javaagent instrumentation
+    // tests under "io.opentelemetry.javaagent." will still be instrumented
+    builder.ignoreClass("io.opentelemetry.javaagent.bootstrap.");
+    builder.ignoreClass("io.opentelemetry.javaagent.instrumentation.api.");
+    builder.ignoreClass("io.opentelemetry.javaagent.shaded.");
+    builder.ignoreClass("io.opentelemetry.javaagent.slf4j.");
 
     builder
         .ignoreClass("java.")

javaagent/src/test/groovy/io/opentelemetry/javaagent/classloading/ClassLoadingTest.groovy

@@ -5,9 +5,9 @@
 
 package io.opentelemetry.javaagent.classloading
 
+import io.opentelemetry.javaagent.ClassToInstrument
+import io.opentelemetry.javaagent.ClassToInstrumentChild
 import io.opentelemetry.javaagent.util.GcUtils
-import io.opentelemetry.test.ClassToInstrument
-import io.opentelemetry.test.ClassToInstrumentChild
 import spock.lang.Specification
 
 import java.lang.ref.WeakReference

javaagent/src/test/java/io/opentelemetry/test/ClassToInstrument.java → javaagent/src/test/java/io/opentelemetry/javaagent/ClassToInstrument.java

@@ -3,14 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.test;
+package io.opentelemetry.javaagent;
 
 import io.opentracing.contrib.dropwizard.Trace;
 
-/**
- * Note: this has to stay outside of 'io.opentelemetry.javaagent' package to be considered for
- * instrumentation
- */
 public class ClassToInstrument {
   @Trace
   public static void someMethod() {}

javaagent/src/test/java/io/opentelemetry/javaagent/ClassToInstrumentChild.java

@@ -0,0 +1,8 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent;
+
+public class ClassToInstrumentChild extends ClassToInstrument {}

javaagent/src/test/java/io/opentelemetry/test/ClassToInstrumentChild.java

@@ -1,12 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package io.opentelemetry.test;
-
-/**
- * Note: this has to stay outside of 'io.opentelemetry.javaagent' package to be considered for
- * instrumentation
- */
-public class ClassToInstrumentChild extends ClassToInstrument {}