diff options
3 files changed, 124 insertions, 1 deletions
diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json index 93e8ce16b6f..df3373ee805 100644 --- a/container-search/abi-spec.json +++ b/container-search/abi-spec.json @@ -4581,6 +4581,121 @@ ], "fields": [] }, + "com.yahoo.search.logging.LocalDiskLogger": { + "superClass": "com.yahoo.search.logging.AbstractThreadedLogger", + "interfaces": [], + "attributes": [ + "public" + ], + "methods": [ + "public void <init>(com.yahoo.search.logging.LocalDiskLoggerConfig)", + "public bridge synthetic boolean send(com.yahoo.search.logging.LoggerEntry)" + ], + "fields": [] + }, + "com.yahoo.search.logging.LocalDiskLoggerConfig$Builder": { + "superClass": "java.lang.Object", + "interfaces": [ + "com.yahoo.config.ConfigInstance$Builder" + ], + "attributes": [ + "public" + ], + "methods": [ + "public void <init>()", + "public void <init>(com.yahoo.search.logging.LocalDiskLoggerConfig)", + "public com.yahoo.search.logging.LocalDiskLoggerConfig$Builder path(java.lang.String)", + "public final boolean dispatchGetConfig(com.yahoo.config.ConfigInstance$Producer)", + "public final java.lang.String getDefMd5()", + "public final java.lang.String getDefName()", + "public final java.lang.String getDefNamespace()", + "public final boolean getApplyOnRestart()", + "public final void setApplyOnRestart(boolean)", + "public com.yahoo.search.logging.LocalDiskLoggerConfig build()" + ], + "fields": [] + }, + "com.yahoo.search.logging.LocalDiskLoggerConfig$Producer": { + "superClass": "java.lang.Object", + "interfaces": [ + "com.yahoo.config.ConfigInstance$Producer" + ], + "attributes": [ + "public", + "interface", + "abstract" + ], + "methods": [ + "public abstract void getConfig(com.yahoo.search.logging.LocalDiskLoggerConfig$Builder)" + ], + "fields": [] + }, + "com.yahoo.search.logging.LocalDiskLoggerConfig": { + "superClass": "com.yahoo.config.ConfigInstance", + "interfaces": [], + "attributes": [ + "public", + "final" + ], + "methods": [ + "public static java.lang.String getDefMd5()", + "public static java.lang.String getDefName()", + "public static java.lang.String getDefNamespace()", + "public void <init>(com.yahoo.search.logging.LocalDiskLoggerConfig$Builder)", + "public java.lang.String path()" + ], + "fields": [ + "public static final java.lang.String CONFIG_DEF_MD5", + "public static final java.lang.String CONFIG_DEF_NAME", + "public static final java.lang.String CONFIG_DEF_NAMESPACE", + "public static final java.lang.String[] CONFIG_DEF_SCHEMA" + ] + }, + "com.yahoo.search.logging.Logger": { + "superClass": "java.lang.Object", + "interfaces": [], + "attributes": [ + "public", + "interface", + "abstract" + ], + "methods": [ + "public com.yahoo.search.logging.LoggerEntry$Builder newEntry()", + "public abstract boolean send(com.yahoo.search.logging.LoggerEntry)" + ], + "fields": [] + }, + "com.yahoo.search.logging.LoggerEntry$Builder": { + "superClass": "java.lang.Object", + "interfaces": [], + "attributes": [ + "public" + ], + "methods": [ + "public void <init>(com.yahoo.search.logging.Logger)", + "public com.yahoo.search.logging.LoggerEntry$Builder timestamp(long)", + "public com.yahoo.search.logging.LoggerEntry$Builder query(com.yahoo.search.Query)", + "public com.yahoo.search.logging.LoggerEntry$Builder blob(byte[])", + "public boolean send()" + ], + "fields": [] + }, + "com.yahoo.search.logging.LoggerEntry": { + "superClass": "java.lang.Object", + "interfaces": [], + "attributes": [ + "public" + ], + "methods": [ + "public java.lang.Long timestamp()", + "public com.yahoo.search.Query query()", + "public java.lang.String queryString()", + "public java.nio.ByteBuffer blob()", + "public java.lang.String toString()", + "public java.lang.String toJson()" + ], + "fields": [] + }, "com.yahoo.search.pagetemplates.PageTemplate": { "superClass": "com.yahoo.component.provider.FreezableComponent", "interfaces": [ diff --git a/container-search/src/main/java/com/yahoo/search/logging/LoggerEntry.java b/container-search/src/main/java/com/yahoo/search/logging/LoggerEntry.java index e69cb7ca428..44eec6e64a0 100644 --- a/container-search/src/main/java/com/yahoo/search/logging/LoggerEntry.java +++ b/container-search/src/main/java/com/yahoo/search/logging/LoggerEntry.java @@ -60,7 +60,7 @@ public class LoggerEntry { JsonGenerator g = new JsonFactory().createGenerator(out, JsonEncoding.UTF8); g.writeStartObject(); - g.writeNumberField("timestamp", timestamp); + g.writeNumberField("timestamp", timestamp == null ? 0 : timestamp); g.writeStringField("query", queryString()); g.writeStringField("blob", Base64.getEncoder().encodeToString(blob.array())); diff --git a/container-search/src/main/java/com/yahoo/search/logging/package-info.java b/container-search/src/main/java/com/yahoo/search/logging/package-info.java new file mode 100644 index 00000000000..0fc9e76ea40 --- /dev/null +++ b/container-search/src/main/java/com/yahoo/search/logging/package-info.java @@ -0,0 +1,8 @@ +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + +@ExportPackage +@PublicApi +package com.yahoo.search.logging; + +import com.yahoo.api.annotations.PublicApi; +import com.yahoo.osgi.annotation.ExportPackage; |