From 99089c5da8bc8bb96a4edc6902ca00b86f68b36b Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Wed, 23 Aug 2023 14:00:41 +0700 Subject: [PATCH] Typo URL for FrontendProxy (#1075) * [frontendproxy] Fix typo URL endpoint for FrontendProxy * Update changelog --- .env | 2 +- CHANGELOG.md | 2 ++ kubernetes/opentelemetry-demo.yaml | 2 +- src/frontendproxy/envoy.tmpl.yaml | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.env b/.env index b454a66fe2..df62f995fe 100644 --- a/.env +++ b/.env @@ -12,7 +12,7 @@ OTEL_COLLECTOR_HOST=otelcol OTEL_COLLECTOR_PORT_GRPC=4317 OTEL_COLLECTOR_PORT_HTTP=4318 OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_GRPC} -PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:8080/oltp-http/v1/traces +PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:8080/otlp-http/v1/traces # OpenTelemetry Resource Definitions OTEL_RESOURCE_ATTRIBUTES="service.namespace=opentelemetry-demo" diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a8802ba80..13a64e6edb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -73,6 +73,8 @@ release. ([#1029](https://github.com/open-telemetry/opentelemetry-demo/pull/1029)) * [frontend] Update dependencies ([#1054](https://github.com/open-telemetry/opentelemetry-demo/pull/1054)) +* [frontendproxy] Fix typo URL endpoint for FrontendProxy + ([#1075](https://github.com/open-telemetry/opentelemetry-demo/pull/1075)) ## 1.4.0 diff --git a/kubernetes/opentelemetry-demo.yaml b/kubernetes/opentelemetry-demo.yaml index 8b03b7cc47..2935446617 100644 --- a/kubernetes/opentelemetry-demo.yaml +++ b/kubernetes/opentelemetry-demo.yaml @@ -7761,7 +7761,7 @@ spec: - name: WEB_OTEL_SERVICE_NAME value: frontend-web - name: PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://localhost:8080/oltp-http/v1/traces + value: http://localhost:8080/otlp-http/v1/traces - name: OTEL_RESOURCE_ATTRIBUTES value: service.name=$(OTEL_SERVICE_NAME),service.instance.id=$(OTEL_K8S_POD_UID),service.namespace=opentelemetry-demo,k8s.namespace.name=$(OTEL_K8S_NAMESPACE),k8s.node.name=$(OTEL_K8S_NODE_NAME),k8s.pod.name=$(OTEL_K8S_POD_NAME) resources: diff --git a/src/frontendproxy/envoy.tmpl.yaml b/src/frontendproxy/envoy.tmpl.yaml index 431f76a166..8e1942a9c0 100644 --- a/src/frontendproxy/envoy.tmpl.yaml +++ b/src/frontendproxy/envoy.tmpl.yaml @@ -36,7 +36,7 @@ static_resources: route: { cluster: featureflag, prefix_rewrite: "/" } - match: { prefix: "/loadgen" } route: { cluster: loadgen, prefix_rewrite: "/" } - - match: { prefix: "/oltp-http/" } + - match: { prefix: "/otlp-http/" } route: { cluster: opentelemetry_collector_http, prefix_rewrite: "/" } - match: { prefix: "/jaeger" } route: { cluster: jaeger }