Jul 31, 2025 · Jul 31, 2025 · Jul 31, 2025 · Jul 31, 2025 · Jul 31, 2025
diff --git a/agent/agentcontainers/api.go b/agent/agentcontainers/api.go

 // WithContainerLabelIncludeFilter sets a label filter for containers.
 // This option can be given multiple times to filter by multiple labels.
 // The behavior is such that only containers matchingone or moreof the
 //providedlabels will be included.
 // The behavior is such that only containers matchingallof the provided
 // labels will be included.
 func WithContainerLabelIncludeFilter(label, value string) Option {
 return func(api *API) {
 api.containerLabelIncludeFilter[label] = value
 slog.F("config_file", configFile),
 )

 // If we haven't set any include filters, we should explicitly ignore test devcontainers.
 if len(api.containerLabelIncludeFilter) == 0 && container.Labels[DevcontainerIsTestRunLabel] == "true" {
 continue
 }

 // Filter out devcontainer tests, unless explicitly set in include filters.
 if len(api.containerLabelIncludeFilter) > 0|| container.Labels[DevcontainerIsTestRunLabel] == "true"{
 var ok bool
 if len(api.containerLabelIncludeFilter) > 0 {
 includeContainer := true
 for label, value := range api.containerLabelIncludeFilter {
 ifv, found := container.Labels[label]; found && v == value {
 ok = true
 }
 v, found := container.Labels[label]

 includeContainer = includeContainer && (found && v == value)
 }
 // Verbose debug logging is fine here since typically filters
 // are only used in development or testing environments.
 if !ok {
 if !includeContainer {
 logger.Debug(ctx, "container does not match include filter, ignoring devcontainer", slog.F("container_labels", container.Labels), slog.F("include_filter", api.containerLabelIncludeFilter))
 continue
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -161,8 +161,8 @@ func WithContainerCLI(ccli ContainerCLI) Option {

		// WithContainerLabelIncludeFilter sets a label filter for containers.
		// This option can be given multiple times to filter by multiple labels.
		// The behavior is such that only containers matchingone or moreof the
		//providedlabels will be included.
		// The behavior is such that only containers matchingallof the provided
		// labels will be included.
		func WithContainerLabelIncludeFilter(label, value string) Option {
		return func(api *API) {
		api.containerLabelIncludeFilter[label] = value
Expand DownExpand Up		@@ -927,17 +927,22 @@ func (api *API) processUpdatedContainersLocked(ctx context.Context, updated code
		slog.F("config_file", configFile),
		)

		// If we haven't set any include filters, we should explicitly ignore test devcontainers.
		if len(api.containerLabelIncludeFilter) == 0 && container.Labels[DevcontainerIsTestRunLabel] == "true" {
		continue
		}

		// Filter out devcontainer tests, unless explicitly set in include filters.
		if len(api.containerLabelIncludeFilter) > 0\|\| container.Labels[DevcontainerIsTestRunLabel] == "true"{
		var ok bool
		if len(api.containerLabelIncludeFilter) > 0 {
		includeContainer := true
		for label, value := range api.containerLabelIncludeFilter {
		ifv, found := container.Labels[label]; found && v == value {
		ok = true
		}
		v, found := container.Labels[label]

		includeContainer = includeContainer && (found && v == value)
Copy link Member mtojekJul 31, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. no break when matched? Copy link ContributorAuthor DanielleMaywoodJul 31, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. The change is to ensureevery filter is found, instead of just one. mtojek reacted with thumbs up emoji
		}
		// Verbose debug logging is fine here since typically filters
		// are only used in development or testing environments.
		if !ok {
		if !includeContainer {
		logger.Debug(ctx, "container does not match include filter, ignoring devcontainer", slog.F("container_labels", container.Labels), slog.F("include_filter", api.containerLabelIncludeFilter))
		continue
		}
Expand Down