Skip to content

Commit b65b0da

Browse files
Fix Gradle 8.3 instrumentation
1 parent 25aa1b4 commit b65b0da

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListenerInjector_8_3.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,23 @@
11
package datadog.trace.instrumentation.gradle;
22

3+
import datadog.trace.util.MethodHandles;
4+
import java.lang.invoke.MethodHandle;
35
import java.util.Arrays;
6+
import org.gradle.api.Action;
47
import org.gradle.initialization.ClassLoaderRegistry;
58
import org.gradle.internal.service.DefaultServiceRegistry;
9+
import org.gradle.internal.service.ServiceRegistration;
610
import org.gradle.internal.service.ServiceRegistry;
711
import org.slf4j.Logger;
812
import org.slf4j.LoggerFactory;
913

1014
public class CiVisibilityGradleListenerInjector_8_3 {
1115

16+
private static final MethodHandles METHOD_HANDLES =
17+
new MethodHandles(DefaultServiceRegistry.class.getClassLoader());
18+
private static final MethodHandle REGISTER_SERVICE =
19+
METHOD_HANDLES.method(DefaultServiceRegistry.class, "register", Action.class);
20+
1221
private static final Logger LOGGER =
1322
LoggerFactory.getLogger(CiVisibilityGradleListenerInjector_8_3.class);
1423

@@ -21,8 +30,9 @@ public static void injectCiVisibilityGradleListener(
2130
Class<?> ciVisibilityGradleListener =
2231
CiVisibilityGradleListenerInjector_8_3.loadCiVisibilityGradleListener(
2332
classLoaderRegistry);
24-
buildScopeServices.register(
25-
serviceRegistration -> serviceRegistration.add(ciVisibilityGradleListener));
33+
Action<ServiceRegistration> registrationAction =
34+
serviceRegistration -> serviceRegistration.add(ciVisibilityGradleListener);
35+
METHOD_HANDLES.invoke(REGISTER_SERVICE, buildScopeServices, registrationAction);
2636
} catch (Exception e) {
2737
LOGGER.warn("Could not inject CI Visibility Gradle listener", e);
2838
}

0 commit comments

Comments
 (0)