From bfe7605707073c44fadbc05677835a44ca6aab7e Mon Sep 17 00:00:00 2001 From: Mervin Yan Date: Fri, 24 Feb 2023 09:27:13 -0500 Subject: [PATCH 1/2] Use browserDetector to populate browser information into frontend telemetry --- src/frontend/utils/telemetry/FrontendTracer.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/frontend/utils/telemetry/FrontendTracer.ts b/src/frontend/utils/telemetry/FrontendTracer.ts index e8bf0090a2..2779164c90 100644 --- a/src/frontend/utils/telemetry/FrontendTracer.ts +++ b/src/frontend/utils/telemetry/FrontendTracer.ts @@ -3,7 +3,7 @@ import { WebTracerProvider } from '@opentelemetry/sdk-trace-web'; import { SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base'; import { registerInstrumentations } from '@opentelemetry/instrumentation'; import { getWebAutoInstrumentations } from '@opentelemetry/auto-instrumentations-web'; -import { Resource } from '@opentelemetry/resources'; +import { Resource, detectResources, browserDetector } from '@opentelemetry/resources'; import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'; import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http'; @@ -13,10 +13,14 @@ const { NEXT_PUBLIC_OTEL_SERVICE_NAME = '', NEXT_PUBLIC_OTEL_EXPORTER_OTLP_TRACE const FrontendTracer = async (collectorString: string) => { const { ZoneContextManager } = await import('@opentelemetry/context-zone'); + let resource = new Resource({ + [SemanticResourceAttributes.SERVICE_NAME]: NEXT_PUBLIC_OTEL_SERVICE_NAME, + }); + + const detectedResources = await detectResources({detectors:[browserDetector]}); + resource = resource.merge(detectedResources); const provider = new WebTracerProvider({ - resource: new Resource({ - [SemanticResourceAttributes.SERVICE_NAME]: NEXT_PUBLIC_OTEL_SERVICE_NAME, - }), + resource }); provider.addSpanProcessor( From 56b2fb3983e6abb261ced2ceb41e8e06ada13bf6 Mon Sep 17 00:00:00 2001 From: Mervin Yan Date: Tue, 28 Feb 2023 13:05:45 -0500 Subject: [PATCH 2/2] Add changelog item for PR#760 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38ab2006f9..b57750b850 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,8 @@ tls_certificate_check and bump to OTP-25 ([#756](https://github.com/open-telemetry/opentelemetry-demo/pull/756)) * Bump up OTEL Java Agent version to 1.23.0 ([#757](https://github.com/open-telemetry/opentelemetry-demo/pull/757)) +* Use browserDetector to populate browser info to frontend-web telemetry +([#760](https://github.com/open-telemetry/opentelemetry-demo/pull/760)) ## v0.1.0