Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove legacy grpc receiver endpoint for GA release #3256

Merged
merged 4 commits into from
May 26, 2021
Merged

remove legacy grpc receiver endpoint for GA release #3256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3291faf
remove legacy grpc receiver endpoint for GA release
mxiamxia May 21, 2021
db707df
Update factory.go
May 26, 2021
757e437
Merge branch 'main' into rm-legacy-port
bogdandrutu May 26, 2021
69c24b5
Merge branch 'main' into rm-legacy-port
bogdandrutu May 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions examples/k8s/otel-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions exporter/otlpexporter/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

Expand Down
2 changes: 1 addition & 1 deletion testbed/testbed/receivers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down