Update ServiceManager.java

optimize service conflict error message, see like[https://github.com/apache/skywalking/issues/10991]， some times the service conflict will print error message to the skywalking-api.log, but not enough to find which service conflict
apache · Jan 19, 2024 · f182795 · f182795
1 parent d5b99f9
commit f182795
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/...pm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/ServiceManager.java b/...pm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/ServiceManager.java
@@ -78,19 +78,20 @@ private Map<Class, BootService> loadAllServices() {
                         throw new ServiceConflictException("Duplicate service define for :" + bootServiceClass);
                     }
                 } else {
-                    Class<? extends BootService> targetService = overrideImplementor.value();
-                    if (bootedServices.containsKey(targetService)) {
-                        boolean presentDefault = bootedServices.get(targetService)
-                                                               .getClass()
-                                                               .isAnnotationPresent(DefaultImplementor.class);
+                    Class<? extends BootService> targetServiceClass = overrideImplementor.value();
+                    if (bootedServices.containsKey(targetServiceClass)) {
+                        BootService previousService = bootedServices.get(targetServiceClass);
+                        boolean presentDefault = previousService.getClass().isAnnotationPresent(DefaultImplementor.class);
                         if (presentDefault) {
-                            bootedServices.put(targetService, bootService);
+                            bootedServices.put(targetServiceClass, bootService);
                         } else {
-                            throw new ServiceConflictException(
-                                "Service " + bootServiceClass + " overrides conflict, " + "exist more than one service want to override :" + targetService);
+                            String errorMsg = String.format("Service %s overrides conflict, more then one service found, " +
+                                            "service[%s] want to override[%s], please check your plugins",
+                                            bootServiceClass, targetServiceClass, previousService.getClass());
+                            throw new ServiceConflictException(errorMsg);
                         }
                     } else {
-                        bootedServices.put(targetService, bootService);
+                        bootedServices.put(targetServiceClass , bootService);
                     }
                 }
             }