Skip to content

Commit 77c70a8

Browse files
committed
afsocket-grammar: http-scraper-responder options must be initialized as the reader cannot
Signed-off-by: Hofi <hofione@gmail.com>
1 parent 7f3f6b0 commit 77c70a8

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

modules/afsocket/afsocket-grammar.ym

+10-6
Original file line numberDiff line numberDiff line change
@@ -486,8 +486,8 @@ source_afnetwork_option
486486
;
487487

488488
proto_http_scraper_prometheus_option
489-
: KW_STAT_TYPE '(' string ')' { CHECK_ERROR(log_proto_http_scraper_responder_options_set_stat_type((LogProtoHTTPScraperResponderOptionsStorage *)last_proto_server_options, $3), @3, "Invalid prometheus scraper stat type: %s", $3); free($3); }
490-
| KW_STAT_QUERY '(' string ')' { log_proto_http_scraper_responder_options_set_stat_query((LogProtoHTTPScraperResponderOptionsStorage *)last_proto_server_options, $3); free($3); }
489+
: KW_STAT_TYPE '(' string ')' { CHECK_ERROR(log_proto_http_scraper_responder_options_set_stat_type(last_proto_server_options, $3), @3, "Invalid prometheus scraper stat type: %s", $3); free($3); }
490+
| KW_STAT_QUERY '(' string ')' { log_proto_http_scraper_responder_options_set_stat_query(last_proto_server_options, $3); free($3); }
491491
;
492492

493493
proto_http_scraper_prometheus_options
@@ -497,11 +497,11 @@ proto_http_scraper_prometheus_options
497497

498498
proto_http_scraper_option
499499
: KW_SCRAPER '('
500-
KW_PROMETHEUS { log_proto_http_scraper_responder_options_set_scraper_type((LogProtoHTTPScraperResponderOptionsStorage *)last_proto_server_options, "prometheus"); }
500+
KW_PROMETHEUS { log_proto_http_scraper_responder_options_set_scraper_type(last_proto_server_options, "prometheus"); }
501501
'(' proto_http_scraper_prometheus_options ')'
502502
')'
503-
| KW_SCRAPE_FREQ_LIMIT '(' nonnegative_integer ')' { log_proto_http_scraper_responder_options_set_scrape_freq_limit((LogProtoHTTPScraperResponderOptionsStorage *)last_proto_server_options, $3); }
504-
| KW_SINGLE_INSTANCE '(' yesno ')' { log_proto_http_scraper_responder_options_set_single_instance((LogProtoHTTPScraperResponderOptionsStorage *)last_proto_server_options, $3); }
503+
| KW_SCRAPE_FREQ_LIMIT '(' nonnegative_integer ')' { log_proto_http_scraper_responder_options_set_scrape_freq_limit(last_proto_server_options, $3); }
504+
| KW_SINGLE_INSTANCE '(' yesno ')' { log_proto_http_scraper_responder_options_set_single_instance(last_proto_server_options, $3); }
505505
;
506506

507507
proto_http_scraper_options
@@ -512,7 +512,11 @@ proto_http_scraper_options
512512
source_afsocket_transport
513513
: afsocket_transport
514514
| KW_TRANSPORT '('
515-
KW_HTTP_SCRAPER { transport_mapper_set_transport(last_transport_mapper, "http-scraper"); }
515+
KW_HTTP_SCRAPER
516+
{
517+
transport_mapper_set_transport(last_transport_mapper, "http-scraper");
518+
log_proto_http_scraper_responder_options_defaults(last_proto_server_options);
519+
}
516520
proto_http_scraper_options
517521
')'
518522
| KW_TRANSPORT '(' string

0 commit comments

Comments
 (0)