Skip to content

Commit cea2aa3

Browse files
puckpuckpuckpuck
committed
Merge branch 'main' into rename.frontend-proxy
# Conflicts: # CHANGELOG.md
2 parents 43ea3f9 + f135bff commit cea2aa3

File tree

13 files changed

+53
-80
lines changed

13 files changed

+53
-80
lines changed

‎.dockerignore

+1-24
Original file line numberDiff line numberDiff line change
@@ -13,35 +13,12 @@ src/*/*/Dockerfile
1313
./src/currency/node_modules/
1414
###################################
1515

16-
###################################
17-
# featureflagservice
18-
# Common development/test artifacts
19-
./src/featureflagservice/cover/
20-
./src/featureflagservice/doc/
21-
./src/featureflagservice/test/
22-
./src/featureflagservice/tmp/
23-
./src/featureflagservice/.elixir_ls
24-
2516
###################################
2617
# frontend
2718
./src/frontend/node_modules/
2819

2920
###################################
30-
# shippingservice
21+
# shipping
3122
./src/shipping/target
3223
###################################
3324

34-
# Mix artifacts
35-
./src/featureflagservice/_build/
36-
./src/featureflagservice/deps/
37-
./src/featureflagservice/*.ez
38-
39-
# Generated on crash by the VM
40-
./src/featureflagservice/erl_crash.dump
41-
42-
# Static artifacts - These should be fetched and built inside the Docker image
43-
./src/featureflagservice/assets/node_modules/
44-
./src/featureflagservice/priv/static/assets/
45-
./src/featureflagservice/priv/static/cache_manifest.json
46-
###################################
47-

‎.env

+10-10
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ FLAGD_UI_PORT=4000
139139
FLAGD_UI_DOCKERFILE=./src/flagd-ui/Dockerfile
140140

141141
# Kafka
142-
KAFKA_SERVICE_PORT=9092
143-
KAFKA_SERVICE_ADDR=kafka:${KAFKA_SERVICE_PORT}
144-
KAFKA_SERVICE_DOCKERFILE=./src/kafka/Dockerfile
142+
KAFKA_PORT=9092
143+
KAFKA_ADDR=kafka:${KAFKA_PORT}
144+
KAFKA_DOCKERFILE=./src/kafka/Dockerfile
145145

146146
# Valkey
147147
VALKEY_PORT=6379
@@ -151,14 +151,14 @@ VALKEY_ADDR=valkey-cart:${VALKEY_PORT}
151151
# Telemetry Components
152152
# ********************
153153
# Grafana
154-
GRAFANA_SERVICE_PORT=3000
155-
GRAFANA_SERVICE_HOST=grafana
154+
GRAFANA_PORT=3000
155+
GRAFANA_HOST=grafana
156156

157157
# Jaeger
158-
JAEGER_SERVICE_PORT=16686
159-
JAEGER_SERVICE_HOST=jaeger
158+
JAEGER_PORT=16686
159+
JAEGER_HOST=jaeger
160160

161161
# Prometheus
162-
PROMETHEUS_SERVICE_PORT=9090
163-
PROMETHEUS_SERVICE_HOST=prometheus
164-
PROMETHEUS_ADDR=${PROMETHEUS_SERVICE_HOST}:${PROMETHEUS_SERVICE_PORT}
162+
PROMETHEUS_PORT=9090
163+
PROMETHEUS_HOST=prometheus
164+
PROMETHEUS_ADDR=${PROMETHEUS_HOST}:${PROMETHEUS_PORT}

‎.gitignore

-4
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@ test/tracetesting/tracetesting-vars.yaml
4343
# Ignore copied/generated protobuf files
4444
/src/accounting/src/protos/
4545
/src/cart/src/protos/
46-
/src/featureflagservice/proto/
47-
/src/featureflagservice/src/ffs_demo_pb.erl
48-
/src/featureflagservice/src/ffs_service_*.erl
49-
/src/featureflagservice/src/oteldemo_*.erl
5046
/src/fraud-detection/src/main/proto
5147
/src/frontend/pb/
5248
/src/frontend/protos/

‎.licenserc.json

-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@
4343
"src/cart/tests/obj/",
4444
"src/currency/build/",
4545
"src/checkout/genproto/",
46-
"src/featureflagservice/assets/vendor/",
47-
"src/featureflagservice/priv/",
4846
"src/product-catalog/genproto/",
4947
"src/react-native-app/ios/Pods/",
5048
"src/react-native-app/ios/build/",

‎CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ the release.
6868
([#1864](https://github.com/open-telemetry/opentelemetry-demo/pull/1864))
6969
* [checkout] rename checkoutservice to checkout
7070
([#1867](https://github.com/open-telemetry/opentelemetry-demo/pull/1867))
71+
* [chore] remove `SERVICE_` from environment variables
72+
([#1897](https://github.com/open-telemetry/opentelemetry-demo/pull/1897))
7173
* [frontend-proxy] rename frontendproxy to frontend-proxy
7274
([#1910](https://github.com/open-telemetry/opentelemetry-demo/pull/1910))
7375

‎docker-compose-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ services:
4747
- PRODUCT_CATALOG_ADDR
4848
- RECOMMENDATION_ADDR
4949
- SHIPPING_ADDR
50-
- KAFKA_SERVICE_ADDR
50+
- KAFKA_ADDR
5151
extra_hosts:
5252
- "host.docker.internal:host-gateway"
5353
volumes:

‎docker-compose.minimal.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -261,10 +261,10 @@ services:
261261
- FRONTEND_HOST
262262
- LOCUST_WEB_HOST
263263
- LOCUST_WEB_PORT
264-
- GRAFANA_SERVICE_PORT
265-
- GRAFANA_SERVICE_HOST
266-
- JAEGER_SERVICE_PORT
267-
- JAEGER_SERVICE_HOST
264+
- GRAFANA_PORT
265+
- GRAFANA_HOST
266+
- JAEGER_PORT
267+
- JAEGER_HOST
268268
- OTEL_COLLECTOR_HOST
269269
- IMAGE_PROVIDER_HOST
270270
- IMAGE_PROVIDER_PORT
@@ -558,7 +558,7 @@ services:
558558
memory: 400M
559559
restart: unless-stopped
560560
ports:
561-
- "${JAEGER_SERVICE_PORT}" # Jaeger UI
561+
- "${JAEGER_PORT}" # Jaeger UI
562562
- "${OTEL_COLLECTOR_PORT_GRPC}"
563563
environment:
564564
- METRICS_STORAGE_TYPE=prometheus
@@ -579,7 +579,7 @@ services:
579579
- ./src/grafana/grafana.ini:/etc/grafana/grafana.ini
580580
- ./src/grafana/provisioning/:/etc/grafana/provisioning/
581581
ports:
582-
- "${GRAFANA_SERVICE_PORT}"
582+
- "${GRAFANA_PORT}"
583583
logging: *logging
584584

585585
# OpenTelemetry Collector
@@ -636,7 +636,7 @@ services:
636636
memory: 300M
637637
restart: unless-stopped
638638
ports:
639-
- "${PROMETHEUS_SERVICE_PORT}:${PROMETHEUS_SERVICE_PORT}"
639+
- "${PROMETHEUS_PORT}:${PROMETHEUS_PORT}"
640640
logging: *logging
641641

642642
# OpenSearch

‎docker-compose.yml

+11-11
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ services:
3232
memory: 120M
3333
restart: unless-stopped
3434
environment:
35-
- KAFKA_SERVICE_ADDR
35+
- KAFKA_ADDR
3636
- OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_HTTP}
3737
- OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
3838
- OTEL_RESOURCE_ATTRIBUTES
@@ -140,7 +140,7 @@ services:
140140
- PAYMENT_ADDR
141141
- PRODUCT_CATALOG_ADDR
142142
- SHIPPING_ADDR
143-
- KAFKA_SERVICE_ADDR
143+
- KAFKA_ADDR
144144
- OTEL_EXPORTER_OTLP_ENDPOINT
145145
- OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
146146
- OTEL_RESOURCE_ATTRIBUTES
@@ -240,7 +240,7 @@ services:
240240
environment:
241241
- FLAGD_HOST
242242
- FLAGD_PORT
243-
- KAFKA_SERVICE_ADDR
243+
- KAFKA_ADDR
244244
- OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_HTTP}
245245
- OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
246246
- OTEL_INSTRUMENTATION_KAFKA_EXPERIMENTAL_SPAN_ATTRIBUTES=true
@@ -335,10 +335,10 @@ services:
335335
- FRONTEND_HOST
336336
- LOCUST_WEB_HOST
337337
- LOCUST_WEB_PORT
338-
- GRAFANA_SERVICE_PORT
339-
- GRAFANA_SERVICE_HOST
340-
- JAEGER_SERVICE_PORT
341-
- JAEGER_SERVICE_HOST
338+
- GRAFANA_PORT
339+
- GRAFANA_HOST
340+
- JAEGER_PORT
341+
- JAEGER_HOST
342342
- OTEL_COLLECTOR_HOST
343343
- IMAGE_PROVIDER_HOST
344344
- IMAGE_PROVIDER_PORT
@@ -643,7 +643,7 @@ services:
643643
container_name: kafka
644644
build:
645645
context: ./
646-
dockerfile: ${KAFKA_SERVICE_DOCKERFILE}
646+
dockerfile: ${KAFKA_DOCKERFILE}
647647
cache_from:
648648
- ${IMAGE_NAME}:${IMAGE_VERSION}-kafka
649649
args:
@@ -704,7 +704,7 @@ services:
704704
memory: 1200M
705705
restart: unless-stopped
706706
ports:
707-
- "${JAEGER_SERVICE_PORT}" # Jaeger UI
707+
- "${JAEGER_PORT}" # Jaeger UI
708708
- "${OTEL_COLLECTOR_PORT_GRPC}"
709709
environment:
710710
- METRICS_STORAGE_TYPE=prometheus
@@ -725,7 +725,7 @@ services:
725725
- ./src/grafana/grafana.ini:/etc/grafana/grafana.ini
726726
- ./src/grafana/provisioning/:/etc/grafana/provisioning/
727727
ports:
728-
- "${GRAFANA_SERVICE_PORT}"
728+
- "${GRAFANA_PORT}"
729729
logging: *logging
730730

731731
# OpenTelemetry Collector
@@ -782,7 +782,7 @@ services:
782782
memory: 300M
783783
restart: unless-stopped
784784
ports:
785-
- "${PROMETHEUS_SERVICE_PORT}:${PROMETHEUS_SERVICE_PORT}"
785+
- "${PROMETHEUS_PORT}:${PROMETHEUS_PORT}"
786786
logging: *logging
787787

788788
# OpenSearch

‎src/accounting/Consumer.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ public Consumer(ILogger<Consumer> logger)
1919
{
2020
_logger = logger;
2121

22-
var servers = Environment.GetEnvironmentVariable("KAFKA_SERVICE_ADDR")
23-
?? throw new ArgumentNullException("KAFKA_SERVICE_ADDR");
22+
var servers = Environment.GetEnvironmentVariable("KAFKA_ADDR")
23+
?? throw new ArgumentNullException("KAFKA_ADDR");
2424

2525
_consumer = BuildConsumer(servers);
2626
_consumer.Subscribe(TopicName);

‎src/checkout/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ func main() {
197197
svc.paymentSvcClient = pb.NewPaymentServiceClient(c)
198198
defer c.Close()
199199

200-
svc.kafkaBrokerSvcAddr = os.Getenv("KAFKA_SERVICE_ADDR")
200+
svc.kafkaBrokerSvcAddr = os.Getenv("KAFKA_ADDR")
201201

202202
if svc.kafkaBrokerSvcAddr != "" {
203203
svc.KafkaProducerClient, err = kafka.CreateKafkaProducer([]string{svc.kafkaBrokerSvcAddr}, log)

‎src/fraud-detection/src/main/kotlin/frauddetection/main.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ fun main() {
3939
props[KEY_DESERIALIZER_CLASS_CONFIG] = StringDeserializer::class.java.name
4040
props[VALUE_DESERIALIZER_CLASS_CONFIG] = ByteArrayDeserializer::class.java.name
4141
props[GROUP_ID_CONFIG] = groupID
42-
val bootstrapServers = System.getenv("KAFKA_SERVICE_ADDR")
42+
val bootstrapServers = System.getenv("KAFKA_ADDR")
4343
if (bootstrapServers == null) {
44-
println("KAFKA_SERVICE_ADDR is not supplied")
44+
println("KAFKA_ADDR is not supplied")
4545
exitProcess(1)
4646
}
4747
props[BOOTSTRAP_SERVERS_CONFIG] = bootstrapServers

‎src/frontend-proxy/envoy.tmpl.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,8 @@ static_resources:
258258
- endpoint:
259259
address:
260260
socket_address:
261-
address: ${GRAFANA_SERVICE_HOST}
262-
port_value: ${GRAFANA_SERVICE_PORT}
261+
address: ${GRAFANA_HOST}
262+
port_value: ${GRAFANA_PORT}
263263
- name: jaeger
264264
type: STRICT_DNS
265265
lb_policy: ROUND_ROBIN
@@ -270,8 +270,8 @@ static_resources:
270270
- endpoint:
271271
address:
272272
socket_address:
273-
address: ${JAEGER_SERVICE_HOST}
274-
port_value: ${JAEGER_SERVICE_PORT}
273+
address: ${JAEGER_HOST}
274+
port_value: ${JAEGER_PORT}
275275
admin:
276276
address:
277277
socket_address:

‎src/quote/composer.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@
66
"php": ">= 8.3",
77
"ext-json": "*",
88
"ext-pcntl": "*",
9-
"monolog/monolog": "3.5.0",
10-
"open-telemetry/api": "1.0.3",
11-
"open-telemetry/sdk": "1.0.8",
12-
"open-telemetry/exporter-otlp": "1.0.4",
13-
"open-telemetry/opentelemetry-auto-slim": "1.0.6",
9+
"monolog/monolog": "3.8.1",
10+
"open-telemetry/api": "1.2.0",
11+
"open-telemetry/sdk": "1.2.0",
12+
"open-telemetry/exporter-otlp": "1.2.0",
13+
"open-telemetry/opentelemetry-auto-slim": "1.0.7",
1414
"open-telemetry/detector-container": "1.0.0",
1515
"open-telemetry/opentelemetry-logger-monolog": "1.0.0",
16-
"guzzlehttp/guzzle": "7.8.1",
17-
"php-di/php-di": "7.0.6",
18-
"php-di/slim-bridge": "3.4.0",
19-
"php-http/guzzle7-adapter": "1.0.0",
20-
"react/http": "v1.9.0",
21-
"slim/psr7": "1.6.1",
22-
"slim/slim": "4.12.0"
16+
"guzzlehttp/guzzle": "7.9.2",
17+
"php-di/php-di": "7.0.7",
18+
"php-di/slim-bridge": "3.4.1",
19+
"php-http/guzzle7-adapter": "1.1.0",
20+
"react/http": "v1.11.0",
21+
"slim/psr7": "1.7.0",
22+
"slim/slim": "4.14.0"
2323
},
2424
"autoload": {
2525
"psr-4": {

0 commit comments

Comments
 (0)