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.

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 the OTLP receiver legacy gRPC port(55680) references #3452

Merged
merged 3 commits into from
May 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion examples/tracing/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ services:
- "8889:8889" # Prometheus exporter metrics
- "13133:13133" # health_check extension
- "9411" # Zipkin receiver
- "55680:55679" # zpages extension
- "55679:55679" # zpages extension
depends_on:
- jaeger
- zipkin
Expand Down
10 changes: 5 additions & 5 deletions exporter/datadogexporter/example/example_k8s_manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ data:
zipkin:
exporters:
otlp:
endpoint: "otel-collector.default:55680"
endpoint: "otel-collector.default:4317"
insecure: true
processors:
batch:
Expand Down Expand Up @@ -113,7 +113,7 @@ spec:
- containerPort: 9411 # Default endpoint for Zipkin receiver.
- containerPort: 14250 # Default endpoint for Jaeger gRPC receiver.
- containerPort: 14268 # Default endpoint for Jaeger HTTP receiver.
- containerPort: 55680 # Default OpenTelemetry gRPC receiver port.
- containerPort: 4317 # Default OpenTelemetry gRPC receiver port.
- containerPort: 55681 # Default OpenTelemetry HTTP receiver port.
env:
# Get pod ip so that k8s_tagger can tag resources
Expand Down Expand Up @@ -190,9 +190,9 @@ metadata:
spec:
ports:
- name: otlp # Default endpoint for OpenTelemetry receiver.
port: 55680
port: 4317
protocol: TCP
targetPort: 55680
targetPort: 4317
- name: metrics # Default endpoint for querying metrics.
port: 8888
selector:
Expand Down Expand Up @@ -235,7 +235,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: 8888 # Default endpoint for querying metrics.
volumeMounts:
- name: otel-collector-config-vol
Expand Down
2 changes: 1 addition & 1 deletion exporter/dynatraceexporter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ receivers:
otlp:
protocols:
grpc:
endpoint: 0.0.0.0:55680
endpoint: 0.0.0.0:4317
exporters:
dynatrace:
endpoint: https://ab12345.live.dynatrace.com
Expand Down
14 changes: 7 additions & 7 deletions exporter/loadbalancingexporter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Refer to [config.yaml](./testdata/config.yaml) for detailed examples on using th
* The `otlp` property configures the template used for building the OTLP exporter. Refer to the OTLP Exporter documentation for information on which options are available. Note that the `endpoint` property should not be set and will be overridden by this exporter with the backend endpoint.
* The `resolver` accepts either a `static` node, or a `dns`. If both are specified, `dns` takes precedence.
* The `hostname` property inside a `dns` node specifies the hostname to query in order to obtain the list of IP addresses.
* The `dns` node also accepts an optional property `port` to specify the port to be used for exporting the traces to the IP addresses resolved from `hostname`. If `port` is not specified, the default port 55680 is used.
* The `dns` node also accepts an optional property `port` to specify the port to be used for exporting the traces to the IP addresses resolved from `hostname`. If `port` is not specified, the default port 4317 is used.


Simple example
Expand All @@ -28,7 +28,7 @@ receivers:
otlp:
protocols:
grpc:
endpoint: localhost:55680
endpoint: localhost:4317

processors:

Expand All @@ -43,10 +43,10 @@ exporters:
resolver:
static:
hostnames:
- backend-1:55680
- backend-2:55680
- backend-3:55680
- backend-4:55680
- backend-1:4317
- backend-2:4317
- backend-3:4317
- backend-4:4317

service:
pipelines:
Expand All @@ -70,7 +70,7 @@ receivers:
otlp/loadbalancer:
protocols:
grpc:
endpoint: localhost:55680
endpoint: localhost:4317
otlp/backend-1:
protocols:
grpc:
Expand Down
4 changes: 2 additions & 2 deletions exporter/loadbalancingexporter/testdata/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ exporters:
resolver:
static:
hostnames:
- endpoint-1 # assumes 55680 as the default port
- endpoint-1 # assumes 4317 as the default port
- endpoint-2:55678
loadbalancing/2:
protocol:
Expand All @@ -23,7 +23,7 @@ exporters:
# how to get the list of backends: DNS
resolver:
dns:
hostname: service-1 # assumes 55680 as the default port for the resolved IP addresses
hostname: service-1 # assumes 4317 as the default port for the resolved IP addresses
loadbalancing/3:
protocol:
otlp:
Expand Down
2 changes: 1 addition & 1 deletion exporter/lokiexporter/example/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ services:
- "1888:1888" # pprof extension
- "8888:8888" # Prometheus metrics exposed by the collector
- "13133:13133" # health_check extension
- "55680:55679" # zpages extension
- "55679:55679" # zpages extension
- "24224:24224" # fluentforwarder
- "24224:24224/udp" # fluentforwarder
depends_on:
Expand Down
2 changes: 1 addition & 1 deletion exporter/sapmexporter/examples/signalfx-k8s.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ spec:
value: # set your token here
ports:
- containerPort: 55679 # Default endpoint for ZPages.
- containerPort: 55680 # Default endpoint for OpenTelemetry receiver.
- containerPort: 4317 # Default endpoint for OpenTelemetry receiver.
- containerPort: 6060 # Default endpoint for HTTP Forwarder extension.
- containerPort: 7276 # Default endpoint for SignalFx APM receiver.
- containerPort: 8888 # Default endpoint for querying metrics.
Expand Down
2 changes: 1 addition & 1 deletion receiver/jmxreceiver/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ receivers:
collection_interval: 10s
# optional: the same as specifying OTLP receiver endpoint.
otlp:
endpoint: mycollectorotlpreceiver:55680
endpoint: mycollectorotlpreceiver:4317
username: my_jmx_username
# determined by the environment variable value
password: $MY_JMX_PASSWORD
Expand Down
2 changes: 1 addition & 1 deletion tracegen/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ receivers:
otlp:
protocols:
grpc:
endpoint: localhost:55680
endpoint: localhost:4317

processors:

Expand Down
2 changes: 1 addition & 1 deletion tracegen/internal/tracegen/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func (c *Config) Flags(fs *flag.FlagSet) {
fs.StringVar(&c.ServiceName, "service", "tracegen", "Service name to use")

// unfortunately, at this moment, the otel-go client doesn't support configuring OTLP via env vars
fs.StringVar(&c.Endpoint, "otlp-endpoint", "localhost:55680", "Target to which the exporter is going to send spans or metrics. This MAY be configured to include a path (e.g. example.com/v1/traces)")
fs.StringVar(&c.Endpoint, "otlp-endpoint", "localhost:4317", "Target to which the exporter is going to send spans or metrics. This MAY be configured to include a path (e.g. example.com/v1/traces)")
fs.BoolVar(&c.Insecure, "otlp-insecure", false, "Whether to enable client transport security for the exporter's grpc or http connection")
}

Expand Down