Fix child/parent class enhancement issue during retransform

apm-sniffer/bytebuddy-patch/src/main/java/net/bytebuddy/agent/builder/SWDescriptionStrategy.java

@@ -145,6 +145,8 @@ static class SWTypeDescriptionWrapper extends TypeDescription.AbstractBase imple
 
         private TypeDescription delegate;
 
+        private Generic superClass;
+
         public SWTypeDescriptionWrapper(TypeDescription delegate, String nameTrait, ClassLoader classLoader, String typeName) {
             this.delegate = delegate;
             this.nameTrait = nameTrait;
@@ -325,7 +327,17 @@ public AnnotationList getDeclaredAnnotations() {
 
         @Override
         public Generic getSuperClass() {
-            return delegate.getSuperClass();
+            if (this.superClass == null) {
+                Generic delegateSuperClass = delegate.getSuperClass();
+                if (delegateSuperClass == null) {
+                    return null;
+                }
+                this.superClass = new ForLoadedSuperClassWrapper(
+                        new SWTypeDescriptionWrapper(delegateSuperClass.asErasure(), this.nameTrait, null, delegateSuperClass.asErasure().getName()),
+                        delegateSuperClass
+                );
+            }
+            return this.superClass;
         }
 
         @Override
@@ -354,6 +366,32 @@ public int getModifiers() {
         }
     }
 
+    static class ForLoadedSuperClassWrapper extends TypeDescription.Generic.LazyProjection.ForLoadedSuperClass {
+        private final TypeDescription delegation;
+        private final TypeDescription.Generic superGeneric;
+
+        protected ForLoadedSuperClassWrapper(TypeDescription delegation, TypeDescription.Generic superGeneric) {
+            super(null); // HACK: a trick here since type is not used anywhere in the wrapper
+            this.delegation = delegation;
+            this.superGeneric = superGeneric;
+        }
+
+        @Override
+        protected TypeDescription.Generic resolve() {
+            return this.delegation.asGenericType();
+        }
+
+        @Override
+        public TypeDescription asErasure() {
+            return this.delegation;
+        }
+
+        @Override
+        public AnnotationList getDeclaredAnnotations() {
+            return superGeneric.getDeclaredAnnotations();
+        }
+    }
+
     static class TypeCache {
         private String typeName;
         private Set<Integer> methodCodes;

apm-sniffer/bytebuddy-patch/src/test/java/org/apache/skywalking/apm/agent/bytebuddy/biz/ChildBar.java

@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.skywalking.apm.agent.bytebuddy.biz;
+
+public class ChildBar extends ParentBar {
+    public String sayHelloChild() {
+        return "Joe";
+    }
+}

apm-sniffer/bytebuddy-patch/src/test/java/org/apache/skywalking/apm/agent/bytebuddy/biz/ParentBar.java

@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.skywalking.apm.agent.bytebuddy.biz;
+
+public class ParentBar {
+    public String sayHelloParent() {
+        return "Joe";
+    }
+}

apm-sniffer/bytebuddy-patch/src/test/java/org/apache/skywalking/apm/agent/bytebuddy/cases/AbstractInterceptTest.java

@@ -38,6 +38,7 @@
 import org.apache.skywalking.apm.agent.bytebuddy.SWAuxiliaryTypeNamingStrategy;
 import org.apache.skywalking.apm.agent.bytebuddy.SWClassFileLocator;
 import org.apache.skywalking.apm.agent.bytebuddy.biz.BizFoo;
+import org.apache.skywalking.apm.agent.bytebuddy.biz.ChildBar;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -63,6 +64,8 @@ public class AbstractInterceptTest {
     public static final String BIZ_FOO_CLASS_NAME = "org.apache.skywalking.apm.agent.bytebuddy.biz.BizFoo";
     public static final String PROJECT_SERVICE_CLASS_NAME = "org.apache.skywalking.apm.agent.bytebuddy.biz.ProjectService";
     public static final String DOC_SERVICE_CLASS_NAME = "org.apache.skywalking.apm.agent.bytebuddy.biz.DocService";
+    public static final String PARENT_BAR_CLASS_NAME = "org.apache.skywalking.apm.agent.bytebuddy.biz.ParentBar";
+    public static final String CHILD_BAR_CLASS_NAME = "org.apache.skywalking.apm.agent.bytebuddy.biz.ChildBar";
     public static final String SAY_HELLO_METHOD = "sayHello";
     public static final int BASE_INT_VALUE = 100;
     public static final String CONSTRUCTOR_INTERCEPTOR_CLASS = "constructorInterceptorClass";
@@ -85,6 +88,20 @@ protected void failed(Throwable e, Description description) {
         }
     };
 
+    protected static void callBar(int round) {
+        Log.info("-------------");
+        Log.info("callChildBar: " + round);
+        // load target class
+        String strResultChild = new ChildBar().sayHelloChild();
+        Log.info("result: " + strResultChild);
+
+        String strResultParent = new ChildBar().sayHelloParent();
+        Log.info("result: " + strResultParent);
+
+        Assert.assertEquals("String value is unexpected", "John", strResultChild);
+        Assert.assertEquals("String value is unexpected", "John", strResultParent);
+    }
+
     protected static void callBizFoo(int round) {
         Log.info("-------------");
         Log.info("callBizFoo: " + round);
@@ -115,7 +132,7 @@ protected static void checkConstructorInterceptor(String className, int round) {
 
     protected static void checkInterface(Class testClass, Class interfaceCls) {
         Assert.assertTrue("Check interface failure, the test class: " + testClass + " does not implement the expected interface: " + interfaceCls,
-                EnhancedInstance.class.isAssignableFrom(BizFoo.class));
+                EnhancedInstance.class.isAssignableFrom(testClass));
     }
 
     protected static void checkErrors() {
@@ -139,8 +156,7 @@ protected void installMethodInterceptorWithMethodDelegation(String className, St
                             return builder
                                     .method(ElementMatchers.nameContainsIgnoreCase(methodName))
                                     .intercept(MethodDelegation.withDefaultConfiguration()
-                                            .to(new InstMethodsInter(interceptorClassName, classLoader), fieldName))
-                                    ;
+                                            .to(new InstMethodsInter(interceptorClassName, classLoader), fieldName));
                         }
                 )
                 .with(getListener(interceptorClassName))
@@ -223,7 +239,7 @@ protected void installTraceClassTransformer(String msg) {
         ClassFileTransformer classFileTransformer = new ClassFileTransformer() {
             @Override
             public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws IllegalClassFormatException {
-                if (className.endsWith("BizFoo") || className.endsWith("ProjectService") || className.endsWith("DocService")) {
+                if (className.endsWith("BizFoo") || className.endsWith("ProjectService") || className.endsWith("DocService") || className.endsWith("ChildBar") || className.endsWith("ParentBar")) {
                     Log.error(msg + className);
                     ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
                     ClassReader cr = new ClassReader(classfileBuffer);

apm-sniffer/bytebuddy-patch/src/test/java/org/apache/skywalking/apm/agent/bytebuddy/cases/ReTransform4Test.java

@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.skywalking.apm.agent.bytebuddy.cases;
+
+import net.bytebuddy.agent.ByteBuddyAgent;
+import org.apache.skywalking.apm.agent.bytebuddy.biz.ChildBar;
+import org.apache.skywalking.apm.agent.bytebuddy.biz.ParentBar;
+import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
+import org.junit.Test;
+
+import java.lang.instrument.Instrumentation;
+
+public class ReTransform4Test extends AbstractReTransformTest {
+
+    @Test
+    public void testEnhancedInstanceForMultiShotRetransform() throws Exception {
+        Instrumentation instrumentation = ByteBuddyAgent.install();
+
+        // install transformer
+        installMethodInterceptor(PARENT_BAR_CLASS_NAME, "sayHelloParent", 1);
+        installMethodInterceptor(CHILD_BAR_CLASS_NAME, "sayHelloChild", 1);
+        // implement EnhancedInstance
+        installInterface(PARENT_BAR_CLASS_NAME);
+        installInterface(CHILD_BAR_CLASS_NAME);
+
+        callBar(1);
+
+        // check interceptors
+        checkInterface(ParentBar.class, EnhancedInstance.class);
+        checkInterface(ChildBar.class, EnhancedInstance.class);
+        checkErrors();
+
+        installTraceClassTransformer("Trace class: ");
+
+        // do retransform
+        reTransform(instrumentation, ChildBar.class);
+
+        // check interceptors
+        checkInterface(ParentBar.class, EnhancedInstance.class);
+        checkInterface(ChildBar.class, EnhancedInstance.class);
+        checkErrors();
+    }
+
+}
+