Merge release-3.10.1 back into main

internal/collector/otelcol.tmpl

@@ -120,7 +120,7 @@ receivers:
 {{- end }}
 
 {{- range $index, $tcplogReceiver := .Receivers.TcplogReceivers }}
-  tcplog/{{$index}}:
+  tcp_log/{{$index}}:
     listen_address: "{{- .ListenAddress -}}"
     operators:
 {{- range $index, $operator := .Operators }}
@@ -317,7 +317,7 @@ service:
       receivers:
         {{- range $receiver := $pipeline.Receivers }}
           {{- if eq $receiver "tcplog/nginx_app_protect" }}
-        - tcplog/nginx_app_protect
+        - tcp_log/nginx_app_protect
           {{- else }}
         - {{ $receiver }}
           {{- end }}

internal/collector/settings_test.go

@@ -200,7 +200,7 @@ func TestTemplateWrite(t *testing.T) {
 	}
 	cfg.Collector.Pipelines.Logs = make(map[string]*config.Pipeline)
 	cfg.Collector.Pipelines.Logs["default"] = &config.Pipeline{
-		Receivers:  []string{"tcplog/default"},
+		Receivers:  []string{"tcp_log/default"},
 		Processors: []string{"securityviolationsfilter/default", "resource/default", "batch/default"},
 		Exporters:  []string{"otlp_grpc/default", "debug"},
 	}

test/config/collector/test-opentelemetry-collector-agent.yaml

@@ -53,7 +53,7 @@ receivers:
       location: ""
       ca: ""
     collection_interval: 20s
-  tcplog/default:
+  tcp_log/default:
     listen_address: "localhost:151"
     operators:
       - type: add
@@ -138,7 +138,7 @@ service:
         - debug
     logs/default:
       receivers:
-        - tcplog/default
+        - tcp_log/default
       processors:
         - securityviolationsfilter/default
         - resource/default