Merge branch 'main' into main

Author: dareste

analyze.go

@@ -265,13 +265,13 @@ var directives = map[string][]uint{
 	"auth_http": {
 		ngxMailMainConf | ngxMailSrvConf | ngxConfTake1,
 	},
-	"auth_Httpheader": {
+	"auth_http_header": {
 		ngxMailMainConf | ngxMailSrvConf | ngxConfTake2,
 	},
-	"auth_Httppass_client_cert": {
+	"auth_http_pass_client_cert": {
 		ngxMailMainConf | ngxMailSrvConf | ngxConfFlag,
 	},
-	"auth_Httptimeout": {
+	"auth_http_timeout": {
 		ngxMailMainConf | ngxMailSrvConf | ngxConfTake1,
 	},
 	"auth_request": {
@@ -922,6 +922,9 @@ var directives = map[string][]uint{
 	"master_process": {
 		ngxMainConf | ngxDirectConf | ngxConfFlag,
 	},
+	"max_errors": {
+		ngxMailMainConf | ngxMailSrvConf | ngxConfTake1,
+	},
 	"max_ranges": {
 		ngxHTTPMainConf | ngxHTTPSrvConf | ngxHTTPLocConf | ngxConfTake1,
 	},
@@ -1010,6 +1013,24 @@ var directives = map[string][]uint{
 		ngxHTTPMainConf | ngxHTTPSrvConf | ngxHTTPLocConf | ngxConfTake1234,
 		ngxStreamMainConf | ngxStreamSrvConf | ngxConfTake1234,
 	},
+	"otel_exporter": {
+		ngxHTTPMainConf | ngxConfBlock | ngxConfNoArgs,
+	},
+	"otel_service_name": {
+		ngxHTTPMainConf | ngxConfTake1,
+	},
+	"otel_span_attr": {
+		ngxHTTPMainConf | ngxHTTPSrvConf | ngxHTTPLocConf | ngxConfTake2,
+	},
+	"otel_span_name": {
+		ngxHTTPMainConf | ngxHTTPSrvConf | ngxHTTPLocConf | ngxConfTake1,
+	},
+	"otel_trace": {
+		ngxHTTPMainConf | ngxHTTPSrvConf | ngxHTTPLocConf | ngxConfTake1,
+	},
+	"otel_trace_context": {
+		ngxHTTPMainConf | ngxHTTPSrvConf | ngxHTTPLocConf | ngxConfTake1,
+	},
 	"output_buffers": {
 		ngxHTTPMainConf | ngxHTTPSrvConf | ngxHTTPLocConf | ngxConfTake2,
 	},
@@ -1205,6 +1226,7 @@ var directives = map[string][]uint{
 	},
 	"proxy_protocol": {
 		ngxStreamMainConf | ngxStreamSrvConf | ngxConfFlag,
+		ngxMailMainConf | ngxMailSrvConf | ngxConfFlag,
 	},
 	"proxy_protocol_timeout": {
 		ngxStreamMainConf | ngxStreamSrvConf | ngxConfTake1,
@@ -1236,6 +1258,9 @@ var directives = map[string][]uint{
 	"proxy_set_header": {
 		ngxHTTPMainConf | ngxHTTPSrvConf | ngxHTTPLocConf | ngxConfTake2,
 	},
+	"proxy_smtp_auth": {
+		ngxMailMainConf | ngxMailSrvConf | ngxConfFlag,
+	},
 	"proxy_socket_keepalive": {
 		ngxHTTPMainConf | ngxHTTPSrvConf | ngxHTTPLocConf | ngxConfFlag,
 		ngxStreamMainConf | ngxStreamSrvConf | ngxConfFlag,

analyze_map.go

@@ -41,6 +41,9 @@ var mapBodies = map[string]mapParameterMasks{
 	"geoip2": {
 		defaultMasks: ngxConf1More,
 	},
+	"otel_exporter": {
+		defaultMasks: ngxConfTake1,
+	},
 }
 
 // analyzeMapBody validates the body of a map-like directive. Map-like directives are block directives

analyze_map_test.go

@@ -175,6 +175,27 @@ func TestAnalyzeMapBody(t *testing.T) {
 			},
 			term: ";",
 		},
+		"valid otel_exporter": {
+			mapDirective: "otel_exporter",
+			parameter: &Directive{
+				Directive: "endpoint",
+				Args:      []string{"localhost:4317"},
+				Line:      5,
+				Block:     Directives{},
+			},
+			term: ";",
+		},
+		"invalid otel_exporter": {
+			mapDirective: "otel_exporter",
+			parameter: &Directive{
+				Directive: "endpoint",
+				Args:      []string{"localhost:4317", "localhost:1234"},
+				Line:      5,
+				Block:     Directives{},
+			},
+			term:    ";",
+			wantErr: &ParseError{What: "invalid number of parameters", BlockCtx: "otel_exporter"},
+		},
 		"missing semicolon": {
 			mapDirective: "map",
 			parameter: &Directive{

analyze_test.go

@@ -234,7 +234,7 @@ func TestAnalyze_njs(t *testing.T) {
 			blockCtx{"http", "location"},
 			false,
 		},
-		"js_periodic not ok in http": {
+		"js_periodic not ok in http if": {
 			&Directive{
 				Directive: "js_periodic",
 				Args:      []string{"function"},
@@ -252,6 +252,15 @@ func TestAnalyze_njs(t *testing.T) {
 			blockCtx{"stream", "server"},
 			false,
 		},
+		"js_periodic not ok in stream": {
+			&Directive{
+				Directive: "js_periodic",
+				Args:      []string{"function"},
+				Line:      5,
+			},
+			blockCtx{"stream"},
+			true,
+		},
 	}
 
 	for name, tc := range testcases {