Skip to content

Commit d389499

Browse files
committed
Use the same otelName (OTEL_COLLECTOR_HOST) for both k8s and docker
1 parent 1d91a4f commit d389499

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

docker-compose.yml

+1
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ services:
296296
- PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
297297
- OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
298298
- WEB_OTEL_SERVICE_NAME=frontend-web
299+
- OTEL_COLLECTOR_HOST
299300
depends_on:
300301
adservice:
301302
condition: service_started

kubernetes/opentelemetry-demo.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -9824,6 +9824,8 @@ spec:
98249824
value: http://localhost:8080/otlp-http/v1/traces
98259825
- name: OTEL_RESOURCE_ATTRIBUTES
98269826
value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo
9827+
- name: OTEL_COLLECTOR_HOST
9828+
value: $(OTEL_COLLECTOR_NAME)
98279829
resources:
98289830
limits:
98299831
memory: 200Mi

src/frontend/pages/_document.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import Document, { DocumentContext, Html, Head, Main, NextScript } from 'next/do
55
import { ServerStyleSheet } from 'styled-components';
66
import {context, propagation} from "@opentelemetry/api";
77

8-
const { ENV_PLATFORM, WEB_OTEL_SERVICE_NAME, PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT, OTEL_COLLECTOR_NAME} = process.env;
8+
const { ENV_PLATFORM, WEB_OTEL_SERVICE_NAME, PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT, OTEL_COLLECTOR_HOST} = process.env;
99

1010
export default class MyDocument extends Document<{ envString: string }> {
1111
static async getInitialProps(ctx: DocumentContext) {
@@ -23,7 +23,7 @@ export default class MyDocument extends Document<{ envString: string }> {
2323
const isSyntheticRequest = baggage?.getEntry('synthetic_request')?.value === 'true';
2424

2525
const otlpTracesEndpoint = isSyntheticRequest
26-
? `http://${OTEL_COLLECTOR_NAME}:4318/v1/traces`
26+
? `http://${OTEL_COLLECTOR_HOST}:4318/v1/traces`
2727
: PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT;
2828

2929
const envString = `

0 commit comments

Comments
 (0)