From 92c751205e8813ea1daa1f35c48546ed7ee75671 Mon Sep 17 00:00:00 2001 From: Pierre Tessier Date: Mon, 12 Dec 2022 09:57:13 -0500 Subject: [PATCH] [frontend] use frontend-web for web client service name (#628) * use frontend-web for web client service name Signed-off-by: Pierre Tessier * use frontend-web for web client service name Signed-off-by: Pierre Tessier Signed-off-by: Pierre Tessier Co-authored-by: Austin Parker --- CHANGELOG.md | 2 ++ docker-compose.yml | 1 + src/frontend/pages/_document.tsx | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 161cd842fa..16a932afb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -154,3 +154,5 @@ significant modifications will be credited to OpenTelemetry Authors. ([#613](https://github.com/open-telemetry/opentelemetry-demo/pull/613)) * Build Kafka image ([#617](https://github.com/open-telemetry/opentelemetry-demo/pull/617)) +* Use `frontend-web` as service name for browser/web requests +([#628](https://github.com/open-telemetry/opentelemetry-demo/pull/628)) diff --git a/docker-compose.yml b/docker-compose.yml index ee3a4b66ca..a95b7535c8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -295,6 +295,7 @@ services: - ENV_PLATFORM - OTEL_SERVICE_NAME=frontend - PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT + - WEB_OTEL_SERVICE_NAME=frontend-web depends_on: - adservice - cartservice diff --git a/src/frontend/pages/_document.tsx b/src/frontend/pages/_document.tsx index deb7147b68..ad39d60dfe 100644 --- a/src/frontend/pages/_document.tsx +++ b/src/frontend/pages/_document.tsx @@ -1,12 +1,12 @@ import Document, { DocumentContext, Html, Head, Main, NextScript } from 'next/document'; import { ServerStyleSheet } from 'styled-components'; -const { ENV_PLATFORM, OTEL_SERVICE_NAME, PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT } = process.env; +const { ENV_PLATFORM, WEB_OTEL_SERVICE_NAME, PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT } = process.env; const envString = ` window.ENV = { NEXT_PUBLIC_PLATFORM: '${ENV_PLATFORM}', - NEXT_PUBLIC_OTEL_SERVICE_NAME: '${OTEL_SERVICE_NAME}', + NEXT_PUBLIC_OTEL_SERVICE_NAME: '${WEB_OTEL_SERVICE_NAME}', NEXT_PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: '${PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT}', }; `;