-
Notifications
You must be signed in to change notification settings - Fork 826
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
add stdout memory mode #6774
base: main
Are you sure you want to change the base?
add stdout memory mode #6774
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
/* | ||
* Copyright The OpenTelemetry Authors | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
package io.opentelemetry.exporter.logging.otlp.internal; | ||
|
||
import io.opentelemetry.sdk.common.export.MemoryMode; | ||
|
||
public class OtlpStdoutExporterBuilderUtil { | ||
public OtlpStdoutExporterBuilderUtil() {} | ||
Check warning on line 11 in exporters/logging-otlp/src/main/java/io/opentelemetry/exporter/logging/otlp/internal/OtlpStdoutExporterBuilderUtil.java Codecov / codecov/patchexporters/logging-otlp/src/main/java/io/opentelemetry/exporter/logging/otlp/internal/OtlpStdoutExporterBuilderUtil.java#L11
|
||
|
||
public static void validate(MemoryMode memoryMode, boolean wrapperJsonObject) { | ||
if (memoryMode == MemoryMode.REUSABLE_DATA && !wrapperJsonObject) { | ||
throw new IllegalArgumentException( | ||
"Reusable data mode is not supported without wrapperJsonObject"); | ||
zeitlinger marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
} | ||
} |
Original file line number | Diff line number | Diff line change | ||
---|---|---|---|---|
|
@@ -5,10 +5,12 @@ | |||
|
||||
package io.opentelemetry.exporter.logging.otlp.internal.logs; | ||||
|
||||
import io.opentelemetry.exporter.internal.otlp.logs.LogsRequestMarshaler; | ||||
import io.opentelemetry.exporter.internal.marshal.Marshaler; | ||||
import io.opentelemetry.exporter.internal.otlp.logs.LogReusableDataMarshaler; | ||||
import io.opentelemetry.exporter.internal.otlp.logs.ResourceLogsMarshaler; | ||||
import io.opentelemetry.exporter.logging.otlp.internal.writer.JsonWriter; | ||||
import io.opentelemetry.sdk.common.CompletableResultCode; | ||||
import io.opentelemetry.sdk.common.export.MemoryMode; | ||||
import io.opentelemetry.sdk.logs.data.LogRecordData; | ||||
import io.opentelemetry.sdk.logs.export.LogRecordExporter; | ||||
import java.util.Collection; | ||||
|
@@ -33,11 +35,14 @@ public final class OtlpStdoutLogRecordExporter implements LogRecordExporter { | |||
private final Logger logger; | ||||
private final JsonWriter jsonWriter; | ||||
private final boolean wrapperJsonObject; | ||||
private final MemoryMode memoryMode; | ||||
|
||||
OtlpStdoutLogRecordExporter(Logger logger, JsonWriter jsonWriter, boolean wrapperJsonObject) { | ||||
OtlpStdoutLogRecordExporter( | ||||
Logger logger, JsonWriter jsonWriter, boolean wrapperJsonObject, MemoryMode memoryMode) { | ||||
this.logger = logger; | ||||
this.jsonWriter = jsonWriter; | ||||
this.wrapperJsonObject = wrapperJsonObject; | ||||
this.memoryMode = memoryMode; | ||||
} | ||||
|
||||
/** Returns a new {@link OtlpStdoutLogRecordExporterBuilder}. */ | ||||
|
@@ -53,8 +58,12 @@ public CompletableResultCode export(Collection<LogRecordData> logs) { | |||
} | ||||
|
||||
if (wrapperJsonObject) { | ||||
LogsRequestMarshaler request = LogsRequestMarshaler.create(logs); | ||||
return jsonWriter.write(request); | ||||
return new LogReusableDataMarshaler(memoryMode) { | ||||
zeitlinger marked this conversation as resolved.
Show resolved
Hide resolved
|
||||
@Override | ||||
public CompletableResultCode doExport(Marshaler exportRequest, int numItems) { | ||||
return jsonWriter.write(exportRequest); | ||||
} | ||||
}.export(logs); | ||||
} else { | ||||
for (ResourceLogsMarshaler resourceLogs : ResourceLogsMarshaler.create(logs)) { | ||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It doesn't seem to be the case that if There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. that's not so easy, because Line 55 in 715211e
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ok let's punt on it for now |
||||
CompletableResultCode resultCode = jsonWriter.write(resourceLogs); | ||||
|
@@ -87,6 +96,7 @@ public String toString() { | |||
StringJoiner joiner = new StringJoiner(", ", "OtlpStdoutLogRecordExporter{", "}"); | ||||
joiner.add("jsonWriter=" + jsonWriter); | ||||
joiner.add("wrapperJsonObject=" + wrapperJsonObject); | ||||
joiner.add("memoryMode=" + memoryMode); | ||||
return joiner.toString(); | ||||
} | ||||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing internal boilerplate javadoc.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why did the build not fail?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's not a build check for it right now. Do you know if
opentelemetry-java-instrumentation
managed to add this automation yet?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh, I didn't upstream it here, check out https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/custom-checks/src/main/java/io/opentelemetry/javaagent/customchecks/OtelInternalJavadoc.java
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Opened new issue here: #6798