diff --git a/examples/k8s/otel-config.yaml b/examples/k8s/otel-config.yaml index 6b1cdd31513f..f8937d7e9dd3 100644 --- a/examples/k8s/otel-config.yaml +++ b/examples/k8s/otel-config.yaml @@ -15,7 +15,7 @@ data: http: exporters: otlp: - endpoint: "otel-collector.default:55680" # TODO: Update me + endpoint: "otel-collector.default:4317" insecure: true sending_queue: num_consumers: 4 @@ -78,7 +78,7 @@ spec: memory: 100Mi ports: - containerPort: 55679 # ZPages endpoint. - - containerPort: 55680 # Default OpenTelemetry receiver port. + - containerPort: 4317 # Default OpenTelemetry receiver port. - containerPort: 8888 # Metrics. volumeMounts: - name: otel-agent-config-vol @@ -159,9 +159,9 @@ metadata: spec: ports: - name: otlp # Default endpoint for OpenTelemetry receiver. - port: 55680 + port: 4317 protocol: TCP - targetPort: 55680 + targetPort: 4317 - name: jaeger-grpc # Default endpoint for Jaeger gRPC receiver port: 14250 - name: jaeger-thrift-http # Default endpoint for Jaeger HTTP receiver. @@ -211,7 +211,7 @@ spec: memory: 400Mi ports: - containerPort: 55679 # Default endpoint for ZPages. - - containerPort: 55680 # Default endpoint for OpenTelemetry receiver. + - containerPort: 4317 # Default endpoint for OpenTelemetry receiver. - containerPort: 14250 # Default endpoint for Jaeger HTTP receiver. - containerPort: 14268 # Default endpoint for Jaeger HTTP receiver. - containerPort: 9411 # Default endpoint for Zipkin receiver. diff --git a/exporter/otlpexporter/README.md b/exporter/otlpexporter/README.md index 4e87f27d76e4..53d8f291bec6 100644 --- a/exporter/otlpexporter/README.md +++ b/exporter/otlpexporter/README.md @@ -34,11 +34,11 @@ Example: ```yaml exporters: otlp: - endpoint: otelcol2:55680 + endpoint: otelcol2:4317 cert_file: file.cert key_file: file.key otlp/2: - endpoint: otelcol2:55680 + endpoint: otelcol2:4317 insecure: true ``` diff --git a/receiver/otlpreceiver/factory.go b/receiver/otlpreceiver/factory.go index dc2774e6d91b..2efbcf38cf2b 100644 --- a/receiver/otlpreceiver/factory.go +++ b/receiver/otlpreceiver/factory.go @@ -32,7 +32,6 @@ const ( defaultGRPCEndpoint = "0.0.0.0:4317" defaultHTTPEndpoint = "0.0.0.0:55681" - legacyGRPCEndpoint = "0.0.0.0:55680" ) // NewFactory creates a new OTLP receiver factory. diff --git a/receiver/otlpreceiver/otlp.go b/receiver/otlpreceiver/otlp.go index 52e9507439f0..97814189f288 100644 --- a/receiver/otlpreceiver/otlp.go +++ b/receiver/otlpreceiver/otlp.go @@ -141,18 +141,6 @@ func (r *otlpReceiver) startProtocolServers(host component.Host) error { if err != nil { return err } - if r.cfg.GRPC.NetAddr.Endpoint == defaultGRPCEndpoint { - r.logger.Info("Setting up a second GRPC listener on legacy endpoint " + legacyGRPCEndpoint) - - // Copy the config. - cfgLegacyGRPC := r.cfg.GRPC - // And use the legacy endpoint. - cfgLegacyGRPC.NetAddr.Endpoint = legacyGRPCEndpoint - err = r.startGRPCServer(cfgLegacyGRPC, host) - if err != nil { - return err - } - } } if r.cfg.HTTP != nil { r.serverHTTP = r.cfg.HTTP.ToServer( diff --git a/testbed/testbed/receivers.go b/testbed/testbed/receivers.go index 81e021b330d7..533d1ab17d33 100644 --- a/testbed/testbed/receivers.go +++ b/testbed/testbed/receivers.go @@ -259,7 +259,7 @@ func (bor *BaseOTLPDataReceiver) GenConfigYAMLStr() string { return str } -const DefaultOTLPPort = 55680 +const DefaultOTLPPort = 4317 // NewOTLPDataReceiver creates a new OTLP DataReceiver that will listen on the specified port after Start // is called.