Suppress per-task-queue metrics for /temporal-sys/ internal queues

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: rkannan82

service/matching/matching_engine.go

@@ -545,14 +545,19 @@ func (e *matchingEngineImpl) loggerAndMetricsForPartition(
 		tag.WorkflowTaskQueueName(partition.RpcName()),
 		tag.WorkflowTaskQueueType(partition.TaskType()),
 		tag.WorkflowNamespace(nsName))
-	metricsHandler := metrics.GetPerTaskQueuePartitionIDScope(
-		e.metricsHandler,
-		nsName,
-		partition,
-		tqConfig.BreakdownMetricsByTaskQueue(),
-		tqConfig.BreakdownMetricsByPartition(),
-		metrics.OperationTag(metrics.MatchingTaskQueuePartitionManagerScope),
-	).WithTags(metrics.NamespaceStateTag(nsState))
+	var metricsHandler metrics.Handler
+	if strings.HasPrefix(partition.TaskQueue().Name(), internalTaskQueuePrefix) {
+		metricsHandler = metrics.NoopMetricsHandler
+	} else {
+		metricsHandler = metrics.GetPerTaskQueuePartitionIDScope(
+			e.metricsHandler,
+			nsName,
+			partition,
+			tqConfig.BreakdownMetricsByTaskQueue(),
+			tqConfig.BreakdownMetricsByPartition(),
+			metrics.OperationTag(metrics.MatchingTaskQueuePartitionManagerScope),
+		).WithTags(metrics.NamespaceStateTag(nsState))
+	}
 	return logger, throttledLogger, metricsHandler
 }
 

service/matching/matching_engine_test.go

@@ -5223,6 +5223,46 @@ func (*testTaskManager) CountTaskQueuesByBuildId(context.Context, *persistence.C
 	return 0, nil
 }
 
+func TestLoggerAndMetricsForPartition_InternalTaskQueue(t *testing.T) {
+	t.Parallel()
+
+	controller := gomock.NewController(t)
+	ns, mockNamespaceCache := createMockNamespaceCache(controller, matchingTestNamespace)
+	config := defaultTestConfig()
+	e := createTestMatchingEngine(log.NewTestLogger(), controller, config, nil, mockNamespaceCache)
+	e.metricsHandler = metricstest.NewCaptureHandler()
+
+	tests := []struct {
+		name       string
+		tqName     string
+		expectNoop bool
+	}{
+		{
+			name:       "normal task queue gets real metrics handler",
+			tqName:     "my-task-queue",
+			expectNoop: false,
+		},
+		{
+			name:       "internal nexus task queue gets noop metrics handler",
+			tqName:     "/temporal-sys/worker-commands/ns/key",
+			expectNoop: true,
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			prtn := newRootPartition(ns.ID().String(), tc.tqName, enumspb.TASK_QUEUE_TYPE_NEXUS)
+			tqConfig := newTaskQueueConfig(prtn.TaskQueue(), config, matchingTestNamespace)
+			_, _, handler := e.loggerAndMetricsForPartition(ns, prtn, tqConfig)
+			if tc.expectNoop {
+				assert.Equal(t, metrics.NoopMetricsHandler, handler)
+			} else {
+				assert.NotEqual(t, metrics.NoopMetricsHandler, handler)
+			}
+		})
+	}
+}
+
 func TestConvertPollWorkflowTaskQueueResponse(t *testing.T) {
 	t.Parallel()