Merge pull request #11810 from zmstone/1024-fix-otel-schema-default-value

fix: use binary string for raw default values
This commit is contained in:
Zaiming (Stone) Shi 2023-10-24 16:20:01 +02:00 committed by GitHub
commit 33db5f5054
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 14 deletions

View File

@ -444,7 +444,7 @@ fields(consumer_kafka_opts) ->
[
{max_batch_bytes,
mk(emqx_schema:bytesize(), #{
default => "896KB", desc => ?DESC(consumer_max_batch_bytes)
default => <<"896KB">>, desc => ?DESC(consumer_max_batch_bytes)
})},
{max_rejoin_attempts,
mk(non_neg_integer(), #{

View File

@ -953,7 +953,7 @@ fields("rpc") ->
sc(
string(),
#{
default => "0.0.0.0",
default => <<"0.0.0.0">>,
desc => ?DESC(rpc_listen_address),
importance => ?IMPORTANCE_MEDIUM
}

View File

@ -77,7 +77,7 @@ fields(file_transfer) ->
desc => ?DESC("init_timeout"),
required => false,
importance => ?IMPORTANCE_LOW,
default => "10s"
default => <<"10s">>
}
)},
{store_segment_timeout,
@ -87,7 +87,7 @@ fields(file_transfer) ->
desc => ?DESC("store_segment_timeout"),
required => false,
importance => ?IMPORTANCE_LOW,
default => "5m"
default => <<"5m">>
}
)},
{assemble_timeout,
@ -97,7 +97,7 @@ fields(file_transfer) ->
desc => ?DESC("assemble_timeout"),
required => false,
importance => ?IMPORTANCE_LOW,
default => "5m"
default => <<"5m">>
}
)},
{storage,
@ -208,7 +208,7 @@ fields(local_storage_segments_gc) ->
#{
desc => ?DESC("storage_gc_interval"),
required => false,
default => "1h"
default => <<"1h">>
}
)},
{maximum_segments_ttl,
@ -218,7 +218,7 @@ fields(local_storage_segments_gc) ->
#{
desc => ?DESC("storage_gc_max_segments_ttl"),
required => false,
default => "24h"
default => <<"24h">>
}
)},
{minimum_segments_ttl,
@ -228,7 +228,7 @@ fields(local_storage_segments_gc) ->
#{
desc => ?DESC("storage_gc_min_segments_ttl"),
required => false,
default => "5m",
default => <<"5m">>,
% NOTE
% This setting does not seem to be useful to an end-user.
hidden => true

View File

@ -1,6 +1,6 @@
{application, emqx_opentelemetry, [
{description, "OpenTelemetry for EMQX Broker"},
{vsn, "0.1.2"},
{vsn, "0.1.3"},
{registered, []},
{mod, {emqx_otel_app, []}},
{applications, [kernel, stdlib, emqx]},

View File

@ -62,7 +62,7 @@ fields("exporter") ->
emqx_schema:url(),
#{
mapping => "opentelemetry_exporter.otlp_endpoint",
default => "http://localhost:4317",
default => <<"http://localhost:4317">>,
desc => ?DESC(endpoint)
}
)},

View File

@ -1,6 +1,6 @@
{application, emqx_s3, [
{description, "EMQX S3"},
{vsn, "5.0.9"},
{vsn, "5.0.10"},
{modules, []},
{registered, [emqx_s3_sup]},
{applications, [

View File

@ -74,7 +74,7 @@ fields(s3) ->
%% not used in a `receive ... after' block, just timestamp comparison
emqx_schema:duration_s(),
#{
default => "1h",
default => <<"1h">>,
desc => ?DESC("url_expire_time"),
required => false
}
@ -83,7 +83,7 @@ fields(s3) ->
mk(
emqx_schema:bytesize(),
#{
default => "5mb",
default => <<"5mb">>,
desc => ?DESC("min_part_size"),
required => true,
validator => fun part_size_validator/1
@ -93,7 +93,7 @@ fields(s3) ->
mk(
emqx_schema:bytesize(),
#{
default => "5gb",
default => <<"5gb">>,
desc => ?DESC("max_part_size"),
required => true,
validator => fun part_size_validator/1