diff options
Diffstat (limited to 'config-model/src/main')
3 files changed, 4 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/otel/OpenTelemetryConfigGenerator.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/otel/OpenTelemetryConfigGenerator.java index 9bac6e4553d..67c45d58a95 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/otel/OpenTelemetryConfigGenerator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/otel/OpenTelemetryConfigGenerator.java @@ -295,7 +295,7 @@ public class OpenTelemetryConfigGenerator { { g.writeFieldName("exporters"); g.writeStartArray(); - g.writeString("file"); + g.writeString("otlphttp/gw"); g.writeEndArray(); } g.writeEndObject(); // metrics diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java index 133195c7039..e797c92ee52 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java @@ -87,6 +87,7 @@ public class ConfigserverCluster extends TreeConfigProducer builder.dynamicReconfiguration(options.hostedVespa().orElse(false)); builder.snapshotMethod(options.zooKeeperSnapshotMethod()); + builder.juteMaxBuffer(options.zookeeperJuteMaxBuffer()); } @Override @@ -197,6 +198,7 @@ public class ConfigserverCluster extends TreeConfigProducer builder.server(curatorBuilder); } builder.zookeeperLocalhostAffinity(true); + builder.juteMaxBuffer(options.zookeeperJuteMaxBuffer()); } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java index ec0fa973d6c..5b5914b3012 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java @@ -38,5 +38,6 @@ public interface CloudConfigOptions { Optional<String> athenzDnsSuffix(); Optional<String> ztsUrl(); String zooKeeperSnapshotMethod(); + Integer zookeeperJuteMaxBuffer(); // in bytes } |