open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Connect AgentLogEmitterProvider global during OpenTelemetryInstaller (#5088) 

* during install, hook up the log emitter provider for instrumentation to use.

* spotless

* Fix tests

* Default instrumentation name to ROOT when logger name null/empty

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
This commit is contained in:
jason plumb 2022-01-13 08:31:02 -08:00 committed by GitHub
parent fce227785f
commit 963b5cc087
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 47 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingHelper.java
View File

@ -31,11 +31,12 @@ public final class JavaUtilLoggingHelper {
return;
}
String instrumentationName = logRecord.getLoggerName();
if (instrumentationName == null || instrumentationName.isEmpty()) {
instrumentationName = "ROOT";
}
LogBuilder builder =
AgentLogEmitterProvider.get()
.logEmitterBuilder(logRecord.getLoggerName())
.build()
.logBuilder();
AgentLogEmitterProvider.get().logEmitterBuilder(instrumentationName).build().logBuilder();
mapLogRecord(builder, logRecord);
builder.emit();
}

6
instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/Log4jHelper.java
View File

@ -24,8 +24,12 @@ public final class Log4jHelper {
// TODO (trask) capture MDC
public static void capture(Category logger, Priority level, Object message, Throwable throwable) {
String instrumentationName = logger.getName();
if (instrumentationName == null || instrumentationName.isEmpty()) {
instrumentationName = "ROOT";
}
LogBuilder builder =
AgentLogEmitterProvider.get().logEmitterBuilder(logger.getName()).build().logBuilder();
AgentLogEmitterProvider.get().logEmitterBuilder(instrumentationName).build().logBuilder();
// message
if (message != null) {

7
instrumentation/log4j/log4j-appender-2.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v2_16/Log4jHelper.java
View File

@ -23,9 +23,12 @@ public final class Log4jHelper {
new LogEventMapper<>(ContextDataAccessorImpl.INSTANCE);
public static void capture(Logger logger, Level level, Message message, Throwable throwable) {
String instrumentationName = logger.getName();
if (instrumentationName == null || instrumentationName.isEmpty()) {
instrumentationName = "ROOT";
}
LogBuilder builder =
AgentLogEmitterProvider.get().logEmitterBuilder(logger.getName()).build().logBuilder();
AgentLogEmitterProvider.get().logEmitterBuilder(instrumentationName).build().logBuilder();
Map<String, String> contextData = ThreadContext.getImmutableContext();
mapper.mapLogEvent(builder, message, level, throwable, null, contextData);
builder.emit();

10
instrumentation/log4j/log4j-appender-2.16/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_16/OpenTelemetryAppender.java
View File

@ -66,12 +66,12 @@ public class OpenTelemetryAppender extends AbstractAppender {
@Override
public void append(LogEvent event) {
String instrumentationName = event.getLoggerName();
if (instrumentationName == null || instrumentationName.isEmpty()) {
instrumentationName = "ROOT";
}
LogBuilder builder =
logEmitterProviderHolder
.get()
.logEmitterBuilder(event.getLoggerName())
.build()
.logBuilder();
logEmitterProviderHolder.get().logEmitterBuilder(instrumentationName).build().logBuilder();
ReadOnlyStringMap contextData = event.getContextData();
mapper.mapLogEvent(
builder,

6
instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java
View File

@ -53,8 +53,12 @@ public final class LoggingEventMapper {
}
public void emit(LogEmitterProvider logEmitterProvider, ILoggingEvent event) {
String instrumentationName = event.getLoggerName();
if (instrumentationName == null || instrumentationName.isEmpty()) {
instrumentationName = "ROOT";
}
LogBuilder builder =
logEmitterProvider.logEmitterBuilder(event.getLoggerName()).build().logBuilder();
logEmitterProvider.logEmitterBuilder(instrumentationName).build().logBuilder();
mapLoggingEvent(builder, event);
builder.emit();
}

12
javaagent-instrumentation-api/src/main/java/io/opentelemetry/javaagent/instrumentation/api/appender/internal/AgentLogEmitterProvider.java
View File

@ -20,11 +20,21 @@ public final class AgentLogEmitterProvider {
/**
* Sets the {@link LogEmitterProvider} that should be used by the agent. Future calls to {@link
* #get()} will return the provided {@link LogEmitterProvider} instance. It should only be called
* once - an attempt to call it a second time will result in an error.
* once - an attempt to call it a second time will result in an error. If trying to set the
* instance {@link LogEmitterProvider} multiple times in tests, use {@link
* LogEmitterProviderHolder#resetForTest()} between them.
*/
public static void set(LogEmitterProvider logEmitterProvider) {
delegate.set(logEmitterProvider);
}
/**
* Unsets the {@link LogEmitterProvider}. This is only meant to be used from tests which need to
* reconfigure {@link LogEmitterProvider}.
*/
public static void resetForTest() {
delegate.resetForTest();
}
private AgentLogEmitterProvider() {}
}

10
javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/OpenTelemetryInstaller.java
View File

@ -5,13 +5,17 @@
package io.opentelemetry.javaagent.tooling;
import io.opentelemetry.instrumentation.api.appender.internal.LogEmitterProvider;
import io.opentelemetry.instrumentation.api.config.Config;
import io.opentelemetry.instrumentation.sdk.appender.internal.DelegatingLogEmitterProvider;
import io.opentelemetry.javaagent.bootstrap.AgentInitializer;
import io.opentelemetry.javaagent.instrumentation.api.OpenTelemetrySdkAccess;
import io.opentelemetry.javaagent.instrumentation.api.appender.internal.AgentLogEmitterProvider;
import io.opentelemetry.sdk.OpenTelemetrySdk;
import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdkBuilder;
import io.opentelemetry.sdk.common.CompletableResultCode;
import io.opentelemetry.sdk.logs.SdkLogEmitterProvider;
import java.util.Arrays;
public class OpenTelemetryInstaller {
@ -47,6 +51,12 @@ public class OpenTelemetryInstaller {
.join(timeout, unit);
});
SdkLogEmitterProvider sdkLogEmitterProvider =
autoConfiguredSdk.getOpenTelemetrySdk().getSdkLogEmitterProvider();
LogEmitterProvider logEmitterProvider =
DelegatingLogEmitterProvider.from(sdkLogEmitterProvider);
AgentLogEmitterProvider.set(logEmitterProvider);
return autoConfiguredSdk;
}
}

1
testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/exporter/AgentTestingLogsCustomizer.java
View File

@ -28,6 +28,7 @@ public class AgentTestingLogsCustomizer implements AgentListener {
BatchLogProcessor.builder(AgentTestingExporterFactory.logExporter).build())
.build();
AgentLogEmitterProvider.resetForTest();
AgentLogEmitterProvider.set(DelegatingLogEmitterProvider.from(logEmitterProvider));
}
}