Skip to content

Commit 69a28d6

Browse files
rlankfocedriczielpuckpuck
authoredJan 19, 2024
[frontendproxy] enable envoy environment resource detector (open-telemetry#1291)
* enable envoy environment resource detector for frontendproxy * use prod envoy and add changelog * s/v1.29.0/v1.29-latest/ * Add OTEL_RESOURCE_ATTRIBUTES to docker compose defs --------- Co-authored-by: Cedric Ziel <cedric@cedric-ziel.com> Co-authored-by: Pierre Tessier <pierre@pierretessier.com>
1 parent c1365ed commit 69a28d6

File tree

5 files changed

+9
-2
lines changed

5 files changed

+9
-2
lines changed
 

‎CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ release.
99

1010
* [grafana] update grafana to 10.2.3
1111
([#1332](https://github.com/open-telemetry/opentelemetry-demo/pull/1332))
12+
* [frontendproxy] Enable envoy environment resource detector
13+
([#1291](https://github.com/open-telemetry/opentelemetry-demo/pull/1291))
1214
* [currencyservice] - add package name prefix to `rpc.service` attribute
1315
([#1333](https://github.com/open-telemetry/opentelemetry-demo/pull/1333))
1416

‎docker-compose.minimal.yml

+1
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ services:
256256
- OTEL_COLLECTOR_HOST
257257
- OTEL_COLLECTOR_PORT_GRPC
258258
- OTEL_COLLECTOR_PORT_HTTP
259+
- OTEL_RESOURCE_ATTRIBUTES
259260
- ENVOY_PORT
260261
depends_on:
261262
frontend:

‎docker-compose.yml

+1
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,7 @@ services:
345345
- OTEL_COLLECTOR_HOST
346346
- OTEL_COLLECTOR_PORT_GRPC
347347
- OTEL_COLLECTOR_PORT_HTTP
348+
- OTEL_RESOURCE_ATTRIBUTES
348349
- ENVOY_PORT
349350
depends_on:
350351
frontend:

‎src/frontendproxy/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# Copyright The OpenTelemetry Authors
22
# SPDX-License-Identifier: Apache-2.0
33

4-
5-
FROM envoyproxy/envoy:v1.28-latest
4+
FROM envoyproxy/envoy:v1.29-latest
65
RUN apt-get update && apt-get install -y gettext-base && apt-get clean && rm -rf /var/lib/apt/lists/*
76

87
USER envoy

‎src/frontendproxy/envoy.tmpl.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ static_resources:
2626
cluster_name: opentelemetry_collector_grpc
2727
timeout: 0.250s
2828
service_name: frontend-proxy
29+
resource_detectors:
30+
- name: envoy.tracers.opentelemetry.resource_detectors.environment
31+
typed_config:
32+
"@type": type.googleapis.com/envoy.extensions.tracers.opentelemetry.resource_detectors.v3.EnvironmentResourceDetectorConfig
2933
route_config:
3034
name: local_route
3135
virtual_hosts:

0 commit comments

Comments
 (0)