diff options
author | Valerij Fredriksen <valerij92@gmail.com> | 2021-04-26 10:56:23 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerij92@gmail.com> | 2021-04-26 10:56:23 +0200 |
commit | 245fb6db25af293c50b9b37c8019259d0ecf6029 (patch) | |
tree | 452bea1ebd983df8c76828e94fec000a4095fbe3 /config-model | |
parent | 1e719fd8d0c97d669788dfa6c7dacc7fc292c954 (diff) |
Log application package warnings using logApplicationPackage()
Diffstat (limited to 'config-model')
31 files changed, 52 insertions, 52 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java index 8befbb48016..a77dd65c608 100644 --- a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java +++ b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java @@ -214,7 +214,7 @@ public class DeployState implements ConfigDefinitionStore { File importFrom = applicationPackage.getFileReference(ApplicationPackage.MODELS_DIR); ImportedMlModels importedModels = new ImportedMlModels(importFrom, modelImporters); for (var entry : importedModels.getSkippedModels().entrySet()) { - deployLogger.log(Level.WARNING, "Skipping import of model " + entry.getKey() + " as an exception " + + deployLogger.logApplicationPackage(Level.WARNING, "Skipping import of model " + entry.getKey() + " as an exception " + "occurred during import. Error: " + entry.getValue()); } return importedModels; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/SDDocumentTypeOrderer.java b/config-model/src/main/java/com/yahoo/searchdefinition/SDDocumentTypeOrderer.java index 0d6c517da82..16609355130 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/SDDocumentTypeOrderer.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/SDDocumentTypeOrderer.java @@ -125,7 +125,7 @@ public class SDDocumentTypeOrderer { } else if (type instanceof ReferenceDataType) { //do nothing } else { - deployLogger.log(Level.WARNING, "Unknown type : " + type); + deployLogger.logApplicationPackage(Level.WARNING, "Unknown type : " + type); } } } diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java index 78400666c36..b08e9948ecd 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java @@ -75,7 +75,7 @@ public class SummaryClass extends Derived { if (fields.containsKey(name)) { SummaryClassField sf = fields.get(name); if (!SummaryClassField.convertDataType(type, transform).equals(sf.getType())) { - deployLogger.log(Level.WARNING, "Conflicting definition of field " + name + ". " + + deployLogger.logApplicationPackage(Level.WARNING, "Conflicting definition of field " + name + ". " + "Declared as type " + sf.getType() + " and " + type); } } else { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/CreatePositionZCurve.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/CreatePositionZCurve.java index 8df5443b98f..2da1a7ac95b 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/CreatePositionZCurve.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/CreatePositionZCurve.java @@ -123,7 +123,7 @@ public class CreatePositionZCurve extends Processor { summary.addDestination("default"); summary.addDestinations(summaryTo); } else if (summary.getTransform() != summaryTransform) { - deployLogger.log(Level.WARNING, "Summary field " + summaryName + " has wrong transform: " + summary.getTransform()); + deployLogger.logApplicationPackage(Level.WARNING, "Summary field " + summaryName + " has wrong transform: " + summary.getTransform()); return; } SummaryField.Source source = new SummaryField.Source(sourceName); diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/FilterFieldNames.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/FilterFieldNames.java index adb8ab62aab..1337a0930c9 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/FilterFieldNames.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/FilterFieldNames.java @@ -63,7 +63,7 @@ public class FilterFieldNames extends Processor { filterFields.add(fieldName); } } else { - deployLogger.log(Level.WARNING, "For rank profile '" + profile.getName() + "': Cannot apply rank filter setting to unexisting field '" + fieldName + "'"); + deployLogger.logApplicationPackage(Level.WARNING, "For rank profile '" + profile.getName() + "': Cannot apply rank filter setting to unexisting field '" + fieldName + "'"); } } } diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImplicitSummaries.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImplicitSummaries.java index eddb0adb8d6..9a170a92447 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImplicitSummaries.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImplicitSummaries.java @@ -170,7 +170,7 @@ public class ImplicitSummaries extends Processor { { // Summary transform attribute may indicate that the ilscript was rewritten to remove summary // by another search that uses this same field in inheritance. - deployLogger.log(Level.WARNING, "Ignoring " + summaryField + ": " + sourceField + + deployLogger.logApplicationPackage(Level.WARNING, "Ignoring " + summaryField + ": " + sourceField + " is not creating a summary value in its indexing statement"); return false; } @@ -184,7 +184,7 @@ public class ImplicitSummaries extends Processor { if (summaryField.getDestinations().size() >0) { destinations = "document summaries " + summaryField.getDestinations(); } - deployLogger.log(Level.WARNING, + deployLogger.logApplicationPackage(Level.WARNING, "Will fetch the disk summary value of " + sourceField + " in " + destinations + " since this summary field uses a dynamic summary value (snippet/bolding): Dynamic summaries and bolding " + "is not supported with summary values fetched from in-memory attributes yet. If you want to see partial updates " + diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processor.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processor.java index 61b5e6f2a64..cd7a7e54f2a 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processor.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processor.java @@ -72,7 +72,7 @@ public abstract class Processor { protected SDField addField(Search search, SDField field, String suffix, String indexing, String queryCommand) { SDField implementationField = search.getConcreteField(field.getName() + "_" + suffix); if (implementationField != null) { - deployLogger.log(Level.WARNING, "Implementation field " + implementationField + " added twice"); + deployLogger.logApplicationPackage(Level.WARNING, "Implementation field " + implementationField + " added twice"); } else { implementationField = new SDField(search.getDocument(), field.getName() + "_" + suffix, DataType.STRING); } @@ -130,7 +130,7 @@ public abstract class Processor { protected void warn(String searchName, String fieldName, String message) { String fullMsg = formatError(searchName, fieldName, message); - deployLogger.log(Level.WARNING, fullMsg); + deployLogger.logApplicationPackage(Level.WARNING, fullMsg); } protected void warn(Search search, Field field, String message) { @@ -139,7 +139,7 @@ public abstract class Processor { protected void info(String searchName, String fieldName, String message) { String fullMsg = formatError(searchName, fieldName, message); - deployLogger.log(Level.INFO, fullMsg); + deployLogger.logApplicationPackage(Level.INFO, fullMsg); } protected void info(Search search, Field field, String message) { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/RankingExpressionTypeResolver.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/RankingExpressionTypeResolver.java index 89b8889b4ae..81766659545 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/RankingExpressionTypeResolver.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/RankingExpressionTypeResolver.java @@ -90,7 +90,7 @@ public class RankingExpressionTypeResolver extends Processor { if ( context.tensorsAreUsed() && ! context.queryFeaturesNotDeclared().isEmpty() && ! warnedAbout.containsAll(context.queryFeaturesNotDeclared())) { - deployLogger.log(Level.WARNING, "The following query features used in '" + profile.getName() + + deployLogger.logApplicationPackage(Level.WARNING, "The following query features used in '" + profile.getName() + "' are not declared in query profile " + "types and will be interpreted as scalars, not tensors: " + context.queryFeaturesNotDeclared()); diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ReservedFunctionNames.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ReservedFunctionNames.java index d7099215f17..4f5e6a6edb9 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ReservedFunctionNames.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ReservedFunctionNames.java @@ -34,7 +34,7 @@ public class ReservedFunctionNames extends Processor { for (RankProfile rp : rankProfileRegistry.all()) { for (String functionName : rp.getFunctions().keySet()) { if (reservedNames.contains(functionName)) { - deployLogger.log(Level.WARNING, "Function '" + functionName + "' " + + deployLogger.logApplicationPackage(Level.WARNING, "Function '" + functionName + "' " + "in rank profile '" + rp.getName() + "' " + "has a reserved name. This might mean that the function shadows " + "the built-in function with the same name." diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryDiskAccessValidator.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryDiskAccessValidator.java index f629b046c7d..4ae624d2c35 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryDiskAccessValidator.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryDiskAccessValidator.java @@ -46,7 +46,7 @@ public class SummaryDiskAccessValidator extends Processor { throw new IllegalArgumentException(summaryField + " in " + summary + " references " + source + ", but this field does not exist"); if ( ! isInMemory(field, summaryField) && ! summary.isFromDisk()) { - deployLogger.log(Level.WARNING, summaryField + " in " + summary + " references " + + deployLogger.logApplicationPackage(Level.WARNING, summaryField + " in " + summary + " references " + source + ", which is not an attribute: Using this " + "summary will cause disk accesses. " + "Set 'from-disk' on this summary class to silence this warning."); diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/IndexCommandResolver.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/IndexCommandResolver.java index d20e9f4c253..329f7a9a417 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/IndexCommandResolver.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/IndexCommandResolver.java @@ -49,11 +49,11 @@ public class IndexCommandResolver extends MultiFieldResolver { for (SDField field : fields) { if (!field.hasQueryCommand(command)) { if (harmonizedCommands.contains(command)) { - deployLogger.log(Level.WARNING, command + " must be added to all fields going to the same index (" + indexName + ")" + + deployLogger.logApplicationPackage(Level.WARNING, command + " must be added to all fields going to the same index (" + indexName + ")" + ", adding to field " + field.getName()); field.addQueryCommand(command); } else { - deployLogger.log(Level.WARNING, "All fields going to the same index should have the same query-commands. Field \'" + field.getName() + + deployLogger.logApplicationPackage(Level.WARNING, "All fields going to the same index should have the same query-commands. Field \'" + field.getName() + "\' doesn't contain command \'" + command+"\'"); } } diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/RankTypeResolver.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/RankTypeResolver.java index a448716d755..e6e9de81f26 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/RankTypeResolver.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/RankTypeResolver.java @@ -31,7 +31,7 @@ public class RankTypeResolver extends MultiFieldResolver { rankType = fields.get(0).getRankType(); first = false; } else if (!field.getRankType().equals(rankType)) { - deployLogger.log(Level.WARNING, "In field '" + field.getName() + "' " + + deployLogger.logApplicationPackage(Level.WARNING, "In field '" + field.getName() + "' " + field.getRankType() + " for index '" + indexName + "' conflicts with " + rankType + " defined for the same index in field '" + diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/StemmingResolver.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/StemmingResolver.java index 483fe2105a3..910493e2aad 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/StemmingResolver.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/StemmingResolver.java @@ -32,7 +32,7 @@ public class StemmingResolver extends MultiFieldResolver { stemming = field.getStemming(search); stemmingField = field; } else if (stemming != field.getStemming(search)) { - deployLogger.log(Level.WARNING, "Field '" + field.getName() + "' has " + field.getStemming(search) + + deployLogger.logApplicationPackage(Level.WARNING, "Field '" + field.getName() + "' has " + field.getStemming(search) + ", whereas field '" + stemmingField.getName() + "' has " + stemming + ". All fields indexing to the index '" + indexName + "' must have the same stemming." + " This should be corrected as it will make indexing fail in a few cases."); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java b/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java index 6213f0592fd..09bbd446803 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java @@ -50,10 +50,10 @@ public class HostSystem extends AbstractConfigProducer<Host> { @SuppressWarnings("unused") Object ignore = java.net.InetAddress.getByName(hostname); } catch (UnknownHostException e) { - deployLogger.log(Level.WARNING, "Unable to lookup IP address of host: " + hostname); + deployLogger.logApplicationPackage(Level.WARNING, "Unable to lookup IP address of host: " + hostname); } if (! hostname.contains(".")) { - deployLogger.log(Level.WARNING, "Host named '" + hostname + "' may not receive any config " + + deployLogger.logApplicationPackage(Level.WARNING, "Host named '" + hostname + "' may not receive any config " + "since it is not a canonical hostname. " + "Disregard this warning when testing in a Docker container."); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ComponentValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ComponentValidator.java index 7485bedf788..6d2295684dc 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ComponentValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ComponentValidator.java @@ -81,7 +81,7 @@ public class ComponentValidator extends Validator { } if (attributes.getValue("Bundle-Version").endsWith(".SNAPSHOT")) { - deployLogger.log(Level.WARNING, "Deploying snapshot bundle " + jarFile.getName() + + deployLogger.logApplicationPackage(Level.WARNING, "Deploying snapshot bundle " + jarFile.getName() + ".\nTo use this bundle, you must include the qualifier 'SNAPSHOT' in the version specification in services.xml."); } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java index f218c06754a..776ee675ffd 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java @@ -193,7 +193,7 @@ public class RankSetupValidator extends Validator { private void validateWarn(Exception e, DeployLogger deployLogger) { String msg = "Unable to execute '"+ binaryName + "', validation of rank expressions will only take place when you start Vespa: " + Exceptions.toMessageString(e); - deployLogger.log(Level.WARNING, msg); + deployLogger.logApplicationPackage(Level.WARNING, msg); } private void validateFail(String output, SearchCluster sc, String sdName, DeployLogger deployLogger) { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/StreamingValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/StreamingValidator.java index 39478730982..0afebbb6e40 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/StreamingValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/StreamingValidator.java @@ -40,7 +40,7 @@ public class StreamingValidator extends Validator { if (sc.getSdConfig() != null) { for (ImmutableSDField sd : sc.getSdConfig().getSearch().allConcreteFields()) { if (sd.getMatching().getType().equals(Matching.Type.GRAM)) { - logger.log(Level.WARNING, "For streaming search cluster '" + sc.getClusterName() + + logger.logApplicationPackage(Level.WARNING, "For streaming search cluster '" + sc.getClusterName() + "', SD field '" + sd.getName() + "': n-gram matching is not supported for streaming search."); } } @@ -67,7 +67,7 @@ public class StreamingValidator extends Validator { // If the field is numeric, we can't print this, because we may have converted the field to // attribute indexing ourselves (IntegerIndex2Attribute) if (sd.getDataType() instanceof NumericDataType) return; - logger.log(Level.WARNING, "For streaming search cluster '" + sc.getClusterName() + + logger.logApplicationPackage(Level.WARNING, "For streaming search cluster '" + sc.getClusterName() + "', SD field '" + sd.getName() + "': 'attribute' has same match semantics as 'index'."); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/UriBindingsValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/UriBindingsValidator.java index e7191cc4bb9..78ee4f4f1c8 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/UriBindingsValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/UriBindingsValidator.java @@ -49,7 +49,7 @@ class UriBindingsValidator extends Validator { if (binding.scheme().equals("https")) { String message = createErrorMessage( binding, "'https' bindings are deprecated, use 'http' instead to bind to both http and https traffic."); - deployState.getDeployLogger().log(Level.WARNING, message); + deployState.getDeployLogger().logApplicationPackage(Level.WARNING, message); } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidator.java index a11628bb0ea..021055b8867 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidator.java @@ -119,7 +119,7 @@ public class ConfigValueChangeValidator implements ChangeValidator { AbstractConfigProducerRoot currentModel, AbstractConfigProducerRoot nextModel) { if (!hasConfigFieldsFlaggedWithRestart(configClass, service.getClass())) { - logger.log(Level.FINE, String.format("%s is listed in the annotation for %s, " + + logger.logApplicationPackage(Level.FINE, String.format("%s is listed in the annotation for %s, " + "but does not have any restart flags in its config definition.", configClass.getSimpleName(), service.getClass().getSimpleName())); return Optional.empty(); @@ -127,7 +127,7 @@ public class ConfigValueChangeValidator implements ChangeValidator { Optional<ConfigInstance> nextConfig = getConfigFromModel(nextModel, configClass, service.getConfigId()); if (!nextConfig.isPresent()) { - logger.log(Level.FINE, String.format( + logger.logApplicationPackage(Level.FINE, String.format( "%s is listed as restart config for %s, but the config does not exist in the new model.", configClass.getSimpleName(), service.getClass().getSimpleName())); return Optional.empty(); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java index be85861ddb6..3390eea21bc 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java @@ -40,13 +40,13 @@ public class UserConfigBuilder { Optional<ConfigDefinition> def = configDefinitionStore.getConfigDefinition(key); if ( ! def.isPresent()) { // TODO: Fail instead of warn - logger.log(Level.WARNING, "Unable to find config definition '" + key.asFileName() + + logger.logApplicationPackage(Level.WARNING, "Unable to find config definition '" + key.asFileName() + "'. Please ensure that the name is spelled correctly, and that the def file is included in a bundle."); } ConfigPayloadBuilder payloadBuilder = new DomConfigPayloadBuilder(def.orElse(null)).build(element); ConfigPayloadBuilder old = builderMap.get(key); if (old != null) { - logger.log(Level.WARNING, "Multiple overrides for " + key + " found. Applying in the order they are discovered"); + logger.logApplicationPackage(Level.WARNING, "Multiple overrides for " + key + " found. Applying in the order they are discovered"); old.override(payloadBuilder); } else { builderMap.put(key, payloadBuilder); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java index e150e5791c0..d6e419cf63f 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java @@ -52,7 +52,7 @@ public class DomAdminV2Builder extends DomAdminBuilderBase { addLogForwarders(adminElement.child("logforwarding"), admin); if (adminElement.child("filedistribution") != null) { - deployState.getDeployLogger().log(Level.WARNING, "'filedistribution' element is deprecated and ignored"); + deployState.getDeployLogger().logApplicationPackage(Level.WARNING, "'filedistribution' element is deprecated and ignored"); } } @@ -65,7 +65,7 @@ public class DomAdminV2Builder extends DomAdminBuilderBase { } int count = configservers.size(); if (count % 2 == 0) { - deployState.getDeployLogger().log(Level.WARNING, "An even number (" + count + ") of config servers have been configured. " + + deployState.getDeployLogger().logApplicationPackage(Level.WARNING, "An even number (" + count + ") of config servers have been configured. " + "This is discouraged, see doc for configuration server "); } return configservers; @@ -116,7 +116,7 @@ public class DomAdminV2Builder extends DomAdminBuilderBase { if (configserverE == null) { configserverE = XML.getChild(adminE, "adminserver"); } else { - deployState.getDeployLogger().log(Level.INFO, "Specifying configserver without parent element configservers in services.xml is deprecated"); + deployState.getDeployLogger().logApplicationPackage(Level.INFO, "Specifying configserver without parent element configservers in services.xml is deprecated"); } Configserver cfgs0 = new ConfigserverBuilder(0, configServerSpecs).build(deployState, configServers, configserverE); cfgs0.setProp("index", 0); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java index 2e04007e6d2..f7b838de911 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java @@ -84,7 +84,7 @@ public class DomAdminV4Builder extends DomAdminBuilderBase { createLogserver(deployState.getDeployLogger(), admin, hosts); } else { - context.getDeployLogger().log(Level.INFO, "No container host available to use for running logserver"); + context.getDeployLogger().logApplicationPackage(Level.INFO, "No container host available to use for running logserver"); } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomHandlerBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomHandlerBuilder.java index 71ff129ffbe..0d253f9e7a8 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomHandlerBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomHandlerBuilder.java @@ -82,7 +82,7 @@ public class DomHandlerBuilder extends VespaDomBuilder.DomConfigProducerBuilder< for (BindingPattern serverBinding : handler.getServerBindings()) { if (serverBinding.hasSamePattern(binding)) { handler.removeServerBinding(serverBinding); - log.log(INFO, "Binding '" + binding.patternString() + "' was already in use by handler '" + + log.logApplicationPackage(INFO, "Binding '" + binding.patternString() + "' was already in use by handler '" + handler.getComponentId() + "', but will now be taken over by handler: " + newHandler.getComponentId()); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java index 5417a522d6a..df6d256787a 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java @@ -105,14 +105,14 @@ public class HttpBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Http> if (explicitDomain == null) { throw new IllegalStateException("No Athenz domain provided for 'access-control'"); } - deployState.getDeployLogger().log(Level.WARNING, "Athenz tenant is not provided by deploy call. This will soon be handled as failure."); + deployState.getDeployLogger().logApplicationPackage(Level.WARNING, "Athenz tenant is not provided by deploy call. This will soon be handled as failure."); } if (explicitDomain != null) { if (tenantDomain != null && !explicitDomain.equals(tenantDomain)) { throw new IllegalArgumentException( String.format("Domain in access-control ('%s') does not match tenant domain ('%s')", explicitDomain.value(), tenantDomain.value())); } - deployState.getDeployLogger().log(Level.WARNING, "Domain in 'access-control' is deprecated and will be removed soon"); + deployState.getDeployLogger().logApplicationPackage(Level.WARNING, "Domain in 'access-control' is deprecated and will be removed soon"); } return tenantDomain != null ? tenantDomain : explicitDomain; } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/QueryProfiles.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/QueryProfiles.java index a001d66bc7b..3227646041a 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/QueryProfiles.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/QueryProfiles.java @@ -64,7 +64,7 @@ public class QueryProfiles implements Serializable, QueryProfilesConfig.Producer } if ( registry.getTypeRegistry().hasApplicationTypes() && registry.allComponents().isEmpty()) { - logger.log(Level.WARNING, "This application define query profile types, but has " + + logger.logApplicationPackage(Level.WARNING, "This application define query profile types, but has " + "no query profiles referencing them so they have no effect. " + (tensorFields.isEmpty() ? "" diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java index 10ea7fb1838..87406b8bc9a 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java @@ -594,7 +594,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { private void checkTagName(Element spec, DeployLogger logger) { if (spec.getTagName().equals(DEPRECATED_CONTAINER_TAG)) { - logger.log(WARNING, "'" + DEPRECATED_CONTAINER_TAG + "' is deprecated as tag name. Use '" + CONTAINER_TAG + "' instead."); + logger.logApplicationPackage(WARNING, "'" + DEPRECATED_CONTAINER_TAG + "' is deprecated as tag name. Use '" + CONTAINER_TAG + "' instead."); } } @@ -637,7 +637,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { } else { jvmOptions = nodesElement.getAttribute(VespaDomBuilder.JVMARGS_ATTRIB_NAME); if (incompatibleGCOptions(jvmOptions)) { - deployLogger.log(WARNING, "You need to move out your GC related options from 'jvmargs' to 'jvm-gc-options'"); + deployLogger.logApplicationPackage(WARNING, "You need to move out your GC related options from 'jvmargs' to 'jvm-gc-options'"); cluster.setJvmGCOptions(ContainerCluster.G1GC); } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/StorageGroup.java b/config-model/src/main/java/com/yahoo/vespa/model/content/StorageGroup.java index f7ee09f6dec..f106b1f7bd5 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/StorageGroup.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/StorageGroup.java @@ -213,7 +213,7 @@ public class StorageGroup { if (group.isPresent() && nodes.isPresent()) throw new IllegalStateException("Both group and nodes exists, only one of these tags is legal"); if (group.isPresent() && (group.get().stringAttribute("name") != null || group.get().integerAttribute("distribution-key") != null)) - deployState.getDeployLogger().log(Level.INFO, "'distribution-key' attribute on a content cluster's root group is ignored"); + deployState.getDeployLogger().logApplicationPackage(Level.INFO, "'distribution-key' attribute on a content cluster's root group is ignored"); GroupBuilder groupBuilder = collectGroup(owner.isHosted(), group, nodes, null, null); StorageGroup storageGroup = (owner.isHosted()) @@ -241,7 +241,7 @@ public class StorageGroup { int minNodesPerGroup = (int)Math.ceil((double)nodesSpec.minResources().nodes() / nodesSpec.minResources().groups()); if (minNodesPerGroup < redundancy) { // TODO: Fail on this on Vespa 8, and simplify - context.getDeployLogger().log(Level.WARNING, + context.getDeployLogger().logApplicationPackage(Level.WARNING, "Cluster '" + clusterElement.stringAttribute("id") + "' " + "specifies redundancy " + redundancy + " but cannot be higher than " + "the minimum nodes per group, which is " + minNodesPerGroup); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java index 38eb15819b9..d9bd413f053 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java @@ -312,7 +312,7 @@ public class ContentCluster extends AbstractConfigProducer implements if (hosts.size() > 1) { var message = "When having content clusters and more than 1 config server " + "it is recommended to configure cluster controllers explicitly."; - deployState.getDeployLogger().log(Level.INFO, message); + deployState.getDeployLogger().logApplicationPackage(Level.INFO, message); } admin.setClusterControllers(createClusterControllers(admin, hosts, diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomTuningDispatchBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomTuningDispatchBuilder.java index d599a1a1aca..64911acae1f 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomTuningDispatchBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomTuningDispatchBuilder.java @@ -29,7 +29,7 @@ public class DomTuningDispatchBuilder { builder.setMinActiveDocsCoverage(dispatchElement.childAsDouble("min-active-docs-coverage")); if (dispatchElement.child("use-local-node") != null) - logger.log(Level.WARNING, "Attribute 'use-local-node' is deprecated and ignored: " + + logger.logApplicationPackage(Level.WARNING, "Attribute 'use-local-node' is deprecated and ignored: " + "The local node will automatically be preferred when appropriate."); return builder.build(); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java b/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java index 7cc9fa7ae02..5e7ac0cabec 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java @@ -88,7 +88,7 @@ public class FileSender implements Serializable { ConfigDefinition configDefinition = builder.getConfigDefinition(); if (configDefinition == null) { // TODO: throw new IllegalArgumentException("Not able to find config definition for " + builder); - logger.log(Level.FINE, "Not able to find config definition for " + key + ". Will not send files for this config"); + logger.logApplicationPackage(Level.FINE, "Not able to find config definition for " + key + ". Will not send files for this config"); return; } // Inspect fields at this level diff --git a/config-model/src/main/javacc/SDParser.jj b/config-model/src/main/javacc/SDParser.jj index 6a4dc6367d1..88c45a18e4e 100644 --- a/config-model/src/main/javacc/SDParser.jj +++ b/config-model/src/main/javacc/SDParser.jj @@ -589,7 +589,7 @@ void bodycfg(SDDocumentType document) : { } */ void compression(SDDocumentType document, String name) : { - deployLogger.log(Level.WARNING, "'compression' for a document is deprecated and ignored"); + deployLogger.logApplicationPackage(Level.WARNING, "'compression' for a document is deprecated and ignored"); CompressionConfig cfg = new CompressionConfig(CompressionType.LZ4); } { @@ -877,7 +877,7 @@ DataType dataType() : } if (isArrayOldStyle) { - deployLogger.log(Level.WARNING, "Data type syntax '" + typeName + "[]' is deprecated, use 'array<" + typeName + ">' instead."); + deployLogger.logApplicationPackage(Level.WARNING, "Data type syntax '" + typeName + "[]' is deprecated, use 'array<" + typeName + ">' instead."); type = DataType.getArray(type); } if ("tag".equalsIgnoreCase(typeName) && type instanceof WeightedSetDataType) ((WeightedSetDataType)type).setTag(true); @@ -1259,7 +1259,7 @@ Object attributeTensorType(AttributeOperation attribute) : tensorType = tensorType("For attribute field '" + attribute.getName() + "'") { // TODO: Remove on Vespa 8 - deployLogger.log(Level.WARNING, "In field '" + attribute.getName() + "': Specifying tensor type on the attribute is deprecated and has no effect."); + deployLogger.logApplicationPackage(Level.WARNING, "In field '" + attribute.getName() + "': Specifying tensor type on the attribute is deprecated and has no effect."); } { return null; } } @@ -1563,7 +1563,7 @@ void body(SDField field) : { } { <BODY> { - deployLogger.log(Level.WARNING, field + ": 'header/body' is deprecated and has no effect."); + deployLogger.logApplicationPackage(Level.WARNING, field + ": 'header/body' is deprecated and has no effect."); } } @@ -1576,7 +1576,7 @@ void header(SDField field) : { } { <HEADER> { - deployLogger.log(Level.WARNING, field + ": 'header/body' is deprecated and has no effect."); + deployLogger.logApplicationPackage(Level.WARNING, field + ": 'header/body' is deprecated and has no effect."); } } @@ -2432,7 +2432,7 @@ void rankDegradationBinSize() : } { <RPBINSIZE> <COLON> freq = consumeFloat() - { deployLogger.log(Level.WARNING, "Specifying 'doc-frequency' in 'rank-degradation' is deprecated and has no effect."); } + { deployLogger.logApplicationPackage(Level.WARNING, "Specifying 'doc-frequency' in 'rank-degradation' is deprecated and has no effect."); } } @@ -2445,7 +2445,7 @@ void rankDegradationBinLow() : } { <RPBINLOW> <COLON> n = integer() - { deployLogger.log(Level.WARNING, "Specifying 'min-fullrank-docs' in 'rank-degradation' is deprecated and has no effect."); } + { deployLogger.logApplicationPackage(Level.WARNING, "Specifying 'min-fullrank-docs' in 'rank-degradation' is deprecated and has no effect."); } } @@ -2458,7 +2458,7 @@ void rankDegradationPosbinSize() : } { <RPPOSBINSIZE> <COLON> avgOcc = consumeFloat() - { deployLogger.log(Level.WARNING, "Specifying 'occurrences-per-doc' in 'rank-degradation' is deprecated and has no effect."); } + { deployLogger.logApplicationPackage(Level.WARNING, "Specifying 'occurrences-per-doc' in 'rank-degradation' is deprecated and has no effect."); } } @@ -2486,7 +2486,7 @@ Object rankDegradation(RankProfile profile) : } { ( <RANKDEGRADATIONFREQ> <COLON> freq = consumeFloat() - { deployLogger.log(Level.WARNING, "Specifying 'rank-degradation-frequency' in 'rank-profile' is deprecated and has no effect."); } + { deployLogger.logApplicationPackage(Level.WARNING, "Specifying 'rank-degradation-frequency' in 'rank-profile' is deprecated and has no effect."); } | <RANKDEGRADATION> lbrace() ( rankDegradationItem() (<NL>)*)+ <RBRACE> ) { |