JUL log correlation

apm-agent-attach-cli/pom.xml

@@ -42,7 +42,7 @@
  <dependency>
  <groupId>co.elastic.logging</groupId>
  <artifactId>log4j2-ecs-layout</artifactId>
- <version>${version.log4j2-ecs-layout}</version>
+ <version>${version.ecs.logging}</version>
  </dependency>
  <dependency>
  <groupId>org.bouncycastle</groupId>

apm-agent-core/pom.xml

@@ -77,7 +77,7 @@
  <dependency>
  <groupId>co.elastic.logging</groupId>
  <artifactId>log4j2-ecs-layout</artifactId>
- <version>${version.log4j2-ecs-layout}</version>
+ <version>${version.ecs.logging}</version>
  </dependency>
 
  <dependency>

apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/ClassLoaderNameMatcher.java

@@ -20,6 +20,8 @@
 
 import net.bytebuddy.matcher.ElementMatcher;
 
+import javax.annotation.Nullable;
+
 public class ClassLoaderNameMatcher extends ElementMatcher.Junction.AbstractBase<ClassLoader> {
 
  private final String name;
@@ -37,8 +39,8 @@ public static ElementMatcher.Junction<ClassLoader> isReflectionClassLoader() {
  .or(classLoaderWithName("jdk.internal.reflect.DelegatingClassLoader"));
  }
 
- @Override
- public boolean matches(ClassLoader target) {
- return target != null && name.equals(target.getClass().getName());
- }
+  @Override
+ public boolean matches(@Nullable ClassLoader target) {
+  return target != null && name.equals(target.getClass().getName());
+  }
 }

apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/CustomElementMatchers.java

@@ -85,7 +85,6 @@ public boolean matches(@Nullable ClassLoader target) {
  };
  }
 
-
  /**
  * Matches only class loaders which can load a certain class.
  * <p>

apm-agent-plugins/apm-ecs-logging-plugin/pom.xml

@@ -19,13 +19,25 @@
  <dependency>
  <groupId>co.elastic.logging</groupId>
  <artifactId>log4j-ecs-layout</artifactId>
- <version>1.4.0</version>
+ <version>${version.ecs.logging}</version>
  <scope>provided</scope>
  </dependency>
  <dependency>
  <groupId>co.elastic.logging</groupId>
  <artifactId>log4j2-ecs-layout</artifactId>
- <version>1.4.0</version>
+ <version>${version.ecs.logging}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>co.elastic.logging</groupId>
+ <artifactId>jul-ecs-formatter</artifactId>
+ <version>${version.ecs.logging}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>co.elastic.apm</groupId>
+ <artifactId>apm-logging-plugin-common</artifactId>
+ <version>${project.version}</version>
  <scope>provided</scope>
  </dependency>
  <dependency>
@@ -39,6 +51,7 @@
  <artifactId>ivy</artifactId>
  <scope>test</scope>
  </dependency>
+
  </dependencies>
 
 </project>

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

@@ -0,0 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. 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 co.elastic.apm.agent.ecs_logging;
+
+import co.elastic.apm.agent.loginstr.LoggingPluginClassLoaderRootPackageCustomizer;
+
+public class EcsLoggingPluginClassLoaderRootPackageCustomizer extends LoggingPluginClassLoaderRootPackageCustomizer {}

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

@@ -0,0 +1,74 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. 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 co.elastic.apm.agent.ecs_logging;
+
+import co.elastic.apm.agent.bci.TracerAwareInstrumentation;
+import co.elastic.apm.agent.loginstr.correlation.CorrelationIdMapAdapter;
+import co.elastic.logging.jul.EcsFormatter;
+import net.bytebuddy.asm.Advice;
+import net.bytebuddy.description.method.MethodDescription;
+import net.bytebuddy.description.type.TypeDescription;
+import net.bytebuddy.matcher.ElementMatcher;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Map;
+
+import static net.bytebuddy.matcher.ElementMatchers.named;
+
+/**
+ * Instruments {@link EcsFormatter#getMdcEntries()} to provide correlation IDs at runtime.
+ * Application(s) copies of ecs-logging and the one in the agent will be instrumented, hence providing log correlation
+ * for all of them.
+ */
+@SuppressWarnings("JavadocReference")
+public class JulEcsFormatterInstrumentation extends TracerAwareInstrumentation {
+
+ @Override
+ public Collection<String> getInstrumentationGroupNames() {
+ return Arrays.asList("logging", "jul-ecs");
+ }
+
+ @Override
+ public ElementMatcher<? super TypeDescription> getTypeMatcher() {
+ return named("co.elastic.logging.jul.EcsFormatter");
+ }
+
+ @Override
+ public ElementMatcher<? super MethodDescription> getMethodMatcher() {
+ return named("getMdcEntries");
+ }
+
+ public static class AdviceClass {
+
+ @Advice.OnMethodEnter(suppress = Throwable.class, inline = false, skipOn = Advice.OnNonDefaultValue.class)
+ public static boolean onEnter() {
+ return true;
+ }
+
+ @Advice.AssignReturned.ToReturned
+ @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class, inline = false)
+ public static Map<String, String> onExit() {
+ return CorrelationIdMapAdapter.get();
+ }
+
+ }
+
+
+}

apm-agent-plugins/apm-ecs-logging-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.PluginClassLoaderRootPackageCustomizer

@@ -0,0 +1 @@
+co.elastic.apm.agent.ecs_logging.EcsLoggingPluginClassLoaderRootPackageCustomizer

apm-agent-plugins/apm-ecs-logging-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.sdk.ElasticApmInstrumentation

@@ -1,2 +1,4 @@
 co.elastic.apm.agent.ecs_logging.Log4j2ServiceNameInstrumentation
 co.elastic.apm.agent.ecs_logging.Log4j2ServiceVersionInstrumentation
+
+co.elastic.apm.agent.ecs_logging.JulEcsFormatterInstrumentation

apm-agent-plugins/apm-ecs-logging-plugin/src/test/java/co/elastic/apm/agent/ecs_logging/JulEcsFormatterInstrumentationTest.java

@@ -0,0 +1,84 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. 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 co.elastic.apm.agent.ecs_logging;
+
+import co.elastic.apm.agent.AbstractInstrumentationTest;
+import co.elastic.apm.agent.impl.error.ErrorCapture;
+import co.elastic.apm.agent.impl.transaction.Transaction;
+import co.elastic.logging.jul.EcsFormatter;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import javax.annotation.Nullable;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+
+import static co.elastic.apm.agent.testutils.assertions.Assertions.assertThat;
+
+public class JulEcsFormatterInstrumentationTest extends AbstractInstrumentationTest {
+
+ @Test
+ void testNoCorrelation() {
+ JsonNode logLine = logSomething();
+
+ assertThat(logLine.get("transaction.id")).isNull();
+ assertThat(logLine.get("trace.id")).isNull();
+ }
+
+ @Test
+ void testActiveTransaction() {
+ Transaction transaction = startTestRootTransaction("log");
+ try {
+ JsonNode logLine = logSomething();
+
+ assertThat(logLine.get("transaction.id").textValue()).isEqualTo(transaction.getTraceContext().getTransactionId().toString());
+ assertThat(logLine.get("trace.id").textValue()).isEqualTo(transaction.getTraceContext().getTraceId().toString());
+ } finally {
+ transaction.deactivate().end();
+ }
+ }
+
+ @Test
+ void testActiveError() {
+ ErrorCapture error = new ErrorCapture(tracer);
+
+ error.activate();
+ try {
+ JsonNode logLine = logSomething();
+
+ assertThat(logLine.get("error.id").textValue()).isEqualTo(error.getTraceContext().getId().toString());
+ } finally {
+ error.deactivate();
+ }
+
+ }
+
+ private static JsonNode logSomething() {
+ EcsFormatter formatter = new EcsFormatter();
+ LogRecord record = new LogRecord(Level.INFO, "msg");
+ try {
+ return new ObjectMapper().readTree(formatter.format(record));
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ }
+}

apm-agent-plugins/apm-logging-plugin/apm-jul-plugin/pom.xml

@@ -26,6 +26,11 @@
  <artifactId>jul-ecs-formatter</artifactId>
  <version>${version.ecs.logging}</version>
  </dependency>
+ <dependency>
+ <groupId>co.elastic.apm</groupId>
+ <artifactId>apm-ecs-logging-plugin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
  <dependency>
  <groupId>${project.groupId}</groupId>
  <artifactId>apm-logging-plugin-common</artifactId>

apm-agent-plugins/apm-logging-plugin/apm-jul-plugin/src/main/java/co/elastic/apm/agent/jul/JulInstrumentation.java

@@ -0,0 +1,33 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. 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 co.elastic.apm.agent.jul;
+
+import co.elastic.apm.agent.loginstr.AbstractLogIntegrationInstrumentation;
+
+import java.util.Collection;
+
+public abstract class JulInstrumentation extends AbstractLogIntegrationInstrumentation {
+
+ @Override
+ public Collection<String> getInstrumentationGroupNames() {
+ Collection<String> ret = super.getInstrumentationGroupNames();
+ ret.add("jul-ecs");
+ return ret;
+ }
+}