Change rule expression to match endpoint types for receiver creator

extension/observer/endpoints.go

@@ -74,6 +74,11 @@ func (e *Endpoint) Env() (EndpointEnv, error) {
 	env := e.Details.Env()
 	env["endpoint"] = e.Target
 
+	if e.Details.Type() == PodType {
+		env["type"] = string(PodType)
+		return env, nil
+	}
+
 	// Populate type field for evaluating rules with `type.port && ...`.
 	// Use string instead of EndpointType for rule evaluation.
 	types := map[string]bool{}
@@ -82,6 +87,7 @@ func (e *Endpoint) Env() (EndpointEnv, error) {
 	}
 	types[string(e.Details.Type())] = true
 	env["type"] = types
+
 	return env, nil
 }
 

extension/observer/endpoints_test.go

@@ -44,11 +44,7 @@ func TestEndpointEnv(t *testing.T) {
 				},
 			},
 			want: EndpointEnv{
-				"type": map[string]bool{
-					"pod":      true,
-					"hostport": false,
-					"port":     false,
-				},
+				"type":     "pod",
 				"endpoint": "192.68.73.2",
 				"name":     "pod_name",
 				"labels": map[string]string{

receiver/receivercreator/README.md

@@ -62,7 +62,7 @@ This setting controls what resource attributes are set on metrics emitted from t
 
 Note that the backticks below are not typos--they indicate the value is set dynamically.
 
-`type.pod`
+`type`
 
 | Resource Attribute | Default       |
 |--------------------|---------------|
@@ -94,7 +94,7 @@ targeting it will have different variables available.
 
 | Variable    | Description                       |
 |-------------|-----------------------------------|
-| type.pod    | `true`                            |
+| type        | `pod`                            |
 | name        | name of the pod                   |
 | namespace   | namespace of the pod              |
 | uid         | unique id of the pod              |
@@ -141,7 +141,7 @@ receivers:
     receivers:
       prometheus_simple:
         # Configure prometheus scraping if standard prometheus annotations are set on the pod.
-        rule: type.pod && annotations["prometheus.io/scrape"] == "true"
+        rule: type == "pod" && annotations["prometheus.io/scrape"] == "true"
         config:
           metrics_path: '`"prometheus.io/path" in annotations ? annotations["prometheus.io/path"] : "/metrics"`'
           endpoint: '`endpoint`:`"prometheus.io/port" in annotations ? annotations["prometheus.io/port"] : 9090`'

receiver/receivercreator/observerhandler_test.go

@@ -137,8 +137,8 @@ func TestDynamicConfig(t *testing.T) {
 	cfg.receiverTemplates = map[string]receiverTemplate{
 		"name/1": {
 			receiverConfig: receiverConfig{typeStr: configmodels.Type("name"), config: userConfigMap{"endpoint": "`endpoint`:6379"}, fullName: "name/1"},
-			Rule:           "type.pod",
-			rule:           newRuleOrPanic("type.pod"),
+			Rule:           "type == \"pod\"",
+			rule:           newRuleOrPanic("type == \"pod\""),
 		},
 	}
 	handler := &observerHandler{

receiver/receivercreator/rules.go

@@ -30,7 +30,7 @@ type rule struct {
 }
 
 // ruleRe is used to verify the rule starts type check.
-var ruleRe = regexp.MustCompile(`^type\.(pod|port)`)
+var ruleRe = regexp.MustCompile(`^type(\s*==\s*"pod"|\.port)`)
 
 // newRule creates a new rule instance.
 func newRule(ruleStr string) (rule, error) {

receiver/receivercreator/rules_test.go

@@ -45,8 +45,8 @@ func Test_ruleEval(t *testing.T) {
 		// Doesn't work yet. See comment in newRule.
 		// {"unknown variable", args{`type == "port" && unknown_var == 1`, portEndpoint}, false, true},
 		{"basic port", args{`type.port && name == "http" && pod.labels["app"] == "redis"`, portEndpoint}, true, false},
-		{"basic pod", args{`type.pod && labels["region"] == "west-1"`, podEndpoint}, true, false},
-		{"annotations", args{`type.pod && annotations["scrape"] == "true"`, podEndpoint}, true, false},
+		{"basic pod", args{`type == "pod" && labels["region"] == "west-1"`, podEndpoint}, true, false},
+		{"annotations", args{`type == "pod" && annotations["scrape"] == "true"`, podEndpoint}, true, false},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {