minor fixes

Author: SylvainJuge

apm-agent-plugins/apm-ecs-logging-plugin/src/main/java/co/elastic/apm/agent/ecs_logging/jul/JulEcsServiceInstrumentation.java

@@ -55,7 +55,7 @@ public static class AdviceClass {
             @Nullable
             @Advice.AssignReturned.ToFields(@ToField(value = "serviceName", typing = Assigner.Typing.DYNAMIC))
             @Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
-            public static String onEnter(@Advice.This EcsFormatter formatter,
+            public static String onEnter(@Advice.This Object formatter,
                                          @Advice.FieldValue("serviceName") @Nullable String serviceName) {
 
                 // setServiceName is protected in earlier versions, thus setting field directly
@@ -79,7 +79,7 @@ public static class AdviceClass {
             @Nullable
             @Advice.AssignReturned.ToFields(@ToField(value = "serviceVersion", typing = Assigner.Typing.DYNAMIC))
             @Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
-            public static String onEnter(@Advice.This EcsFormatter formatter,
+            public static String onEnter(@Advice.This Object formatter,
                                          @Advice.FieldValue("serviceVersion") @Nullable String serviceVersion) {
 
                 return EcsLoggingUtils.getOrWarnServiceVersion(formatter, serviceVersion);

apm-agent-plugins/apm-ecs-logging-plugin/src/main/java/co/elastic/apm/agent/ecs_logging/logback/LogBackServiceInstrumentation.java

@@ -54,9 +54,8 @@ public static class AdviceClass {
             @Nullable
             @Advice.AssignReturned.ToFields(@ToField("serviceName"))
             @Advice.OnMethodExit(suppress = Throwable.class, inline = false)
-            public static String onExit(
-                @Advice.This Object encoder,
-                @Advice.FieldValue("serviceName") @Nullable String serviceName) {
+            public static String onExit(@Advice.This Object encoder,
+                                        @Advice.FieldValue("serviceName") @Nullable String serviceName) {
 
                 return EcsLoggingUtils.getOrWarnServiceName(encoder, serviceName);
             }
@@ -91,9 +90,10 @@ public static class VersionAdvice {
         @Nullable
         @Advice.AssignReturned.ToFields(@ToField("serviceVersion"))
         @Advice.OnMethodExit(suppress = Throwable.class, inline = false)
-        public static String onExit(@Advice.FieldValue("serviceVersion") @Nullable String serviceVersion) {
+        public static String onExit(@Advice.This Object encoder,
+                                    @Advice.FieldValue("serviceVersion") @Nullable String serviceVersion) {
 
-            return EcsLoggingUtils.getOrWarnServiceVersion(null, serviceVersion);
+            return EcsLoggingUtils.getOrWarnServiceVersion(encoder, serviceVersion);
         }
     }