Skip to content

Commit 8cb101d

Browse files
puckpuckpuckpuck
authored
[product-catalog] rename productcatalogservice to product-catalog (#1864)
* rename productcatalogservice to product-catalog * rename productcatalogservice to product-catalog * rename productcatalogservice to product-catalog * rename productcatalogservice to product-catalog
1 parent 1efe410 commit 8cb101d

31 files changed

+94
-92
lines changed

‎.env

+3-3
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ PAYMENT_ADDR=payment:${PAYMENT_PORT}
107107
PAYMENT_DOCKERFILE=./src/payment/Dockerfile
108108

109109
# Product Catalog Service
110-
PRODUCT_CATALOG_SERVICE_PORT=3550
111-
PRODUCT_CATALOG_SERVICE_ADDR=productcatalogservice:${PRODUCT_CATALOG_SERVICE_PORT}
112-
PRODUCT_CATALOG_DOCKERFILE=./src/productcatalogservice/Dockerfile
110+
PRODUCT_CATALOG_PORT=3550
111+
PRODUCT_CATALOG_ADDR=product-catalog:${PRODUCT_CATALOG_PORT}
112+
PRODUCT_CATALOG_DOCKERFILE=./src/product-catalog/Dockerfile
113113

114114
# Quote Service
115115
QUOTE_PORT=8090

‎.github/workflows/component-build-images.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ jobs:
107107
tag_suffix: payment
108108
context: ./
109109
setup-qemu: true
110-
- file: ./src/productcatalogservice/Dockerfile
111-
tag_suffix: productcatalogservice
110+
- file: ./src/product-catalog/Dockerfile
111+
tag_suffix: product-catalog
112112
context: ./
113113
setup-qemu: true
114114
- file: ./src/quote/Dockerfile

‎.licenserc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"src/checkoutservice/genproto/",
4646
"src/featureflagservice/assets/vendor/",
4747
"src/featureflagservice/priv/",
48-
"src/productcatalogservice/genproto/",
48+
"src/product-catalog/genproto/",
4949
"src/react-native-app/ios/Pods/",
5050
"src/react-native-app/ios/build/",
5151
"src/react-native-app/android/app/build/",

‎CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ the release.
6464
([#1863](https://github.com/open-telemetry/opentelemetry-demo/pull/1863))
6565
* [recommendation] rename recommendationservice to recommendation
6666
([#1865](https://github.com/open-telemetry/opentelemetry-demo/pull/1865))
67+
* [product-catalog] rename productcatalogservice to product-catalog
68+
([#1864](https://github.com/open-telemetry/opentelemetry-demo/pull/1864))
6769

6870
## 1.12.0
6971

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ docker-generate-protobuf:
139139

140140
.PHONY: clean
141141
clean:
142-
rm -rf ./src/{checkoutservice,productcatalogservice}/genproto/oteldemo/
142+
rm -rf ./src/{checkoutservice,product-catalog}/genproto/oteldemo/
143143
rm -rf ./src/recommendation/{demo_pb2,demo_pb2_grpc}.py
144144

145145
.PHONY: check-clean-work-tree

‎docker-compose-tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ services:
4444
- EMAIL_ADDR
4545
- FRONTEND_ADDR
4646
- PAYMENT_ADDR
47-
- PRODUCT_CATALOG_SERVICE_ADDR
47+
- PRODUCT_CATALOG_ADDR
4848
- RECOMMENDATION_ADDR
4949
- SHIPPING_ADDR
5050
- KAFKA_SERVICE_ADDR
@@ -75,7 +75,7 @@ services:
7575
condition: service_started
7676
payment:
7777
condition: service_started
78-
productcatalogservice:
78+
product-catalog:
7979
condition: service_started
8080
quote:
8181
condition: service_started

‎docker-compose.minimal.yml

+13-13
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ services:
103103
- EMAIL_ADDR
104104
- FLAGD_HOST
105105
- PAYMENT_ADDR
106-
- PRODUCT_CATALOG_SERVICE_ADDR
106+
- PRODUCT_CATALOG_ADDR
107107
- SHIPPING_ADDR
108108
- OTEL_EXPORTER_OTLP_ENDPOINT
109109
- OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
@@ -118,7 +118,7 @@ services:
118118
condition: service_started
119119
payment:
120120
condition: service_started
121-
productcatalogservice:
121+
product-catalog:
122122
condition: service_started
123123
shipping:
124124
condition: service_started
@@ -203,7 +203,7 @@ services:
203203
- CART_ADDR
204204
- CHECKOUT_SERVICE_ADDR
205205
- CURRENCY_ADDR
206-
- PRODUCT_CATALOG_SERVICE_ADDR
206+
- PRODUCT_CATALOG_ADDR
207207
- RECOMMENDATION_ADDR
208208
- SHIPPING_ADDR
209209
- OTEL_EXPORTER_OTLP_ENDPOINT
@@ -225,7 +225,7 @@ services:
225225
condition: service_started
226226
currency:
227227
condition: service_started
228-
productcatalogservice:
228+
product-catalog:
229229
condition: service_started
230230
quote:
231231
condition: service_started
@@ -379,28 +379,28 @@ services:
379379
logging: *logging
380380

381381
# Product Catalog service
382-
productcatalogservice:
383-
image: ${IMAGE_NAME}:${DEMO_VERSION}-productcatalogservice
384-
container_name: product-catalog-service
382+
product-catalog:
383+
image: ${IMAGE_NAME}:${DEMO_VERSION}-product-catalog
384+
container_name: product-catalog
385385
build:
386386
context: ./
387387
dockerfile: ${PRODUCT_CATALOG_DOCKERFILE}
388388
cache_from:
389-
- ${IMAGE_NAME}:${IMAGE_VERSION}-productcatalogservice
389+
- ${IMAGE_NAME}:${IMAGE_VERSION}-product-catalog
390390
deploy:
391391
resources:
392392
limits:
393393
memory: 20M
394394
restart: unless-stopped
395395
ports:
396-
- "${PRODUCT_CATALOG_SERVICE_PORT}"
396+
- "${PRODUCT_CATALOG_PORT}"
397397
environment:
398398
- FLAGD_HOST
399-
- PRODUCT_CATALOG_SERVICE_PORT
399+
- PRODUCT_CATALOG_PORT
400400
- OTEL_EXPORTER_OTLP_ENDPOINT
401401
- OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
402402
- OTEL_RESOURCE_ATTRIBUTES
403-
- OTEL_SERVICE_NAME=productcatalogservice
403+
- OTEL_SERVICE_NAME=product-catalog
404404
depends_on:
405405
otel-collector:
406406
condition: service_started
@@ -453,15 +453,15 @@ services:
453453
environment:
454454
- FLAGD_HOST
455455
- RECOMMENDATION_PORT
456-
- PRODUCT_CATALOG_SERVICE_ADDR
456+
- PRODUCT_CATALOG_ADDR
457457
- OTEL_PYTHON_LOG_CORRELATION=true
458458
- OTEL_EXPORTER_OTLP_ENDPOINT
459459
- OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
460460
- OTEL_RESOURCE_ATTRIBUTES
461461
- OTEL_SERVICE_NAME=recommendation
462462
- PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
463463
depends_on:
464-
productcatalogservice:
464+
product-catalog:
465465
condition: service_started
466466
otel-collector:
467467
condition: service_started

‎docker-compose.yml

+13-13
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ services:
136136
- CURRENCY_ADDR
137137
- EMAIL_ADDR
138138
- PAYMENT_ADDR
139-
- PRODUCT_CATALOG_SERVICE_ADDR
139+
- PRODUCT_CATALOG_ADDR
140140
- SHIPPING_ADDR
141141
- KAFKA_SERVICE_ADDR
142142
- OTEL_EXPORTER_OTLP_ENDPOINT
@@ -152,7 +152,7 @@ services:
152152
condition: service_started
153153
payment:
154154
condition: service_started
155-
productcatalogservice:
155+
product-catalog:
156156
condition: service_started
157157
shipping:
158158
condition: service_started
@@ -275,7 +275,7 @@ services:
275275
- CART_ADDR
276276
- CHECKOUT_SERVICE_ADDR
277277
- CURRENCY_ADDR
278-
- PRODUCT_CATALOG_SERVICE_ADDR
278+
- PRODUCT_CATALOG_ADDR
279279
- RECOMMENDATION_ADDR
280280
- SHIPPING_ADDR
281281
- OTEL_EXPORTER_OTLP_ENDPOINT
@@ -297,7 +297,7 @@ services:
297297
condition: service_started
298298
currency:
299299
condition: service_started
300-
productcatalogservice:
300+
product-catalog:
301301
condition: service_started
302302
quote:
303303
condition: service_started
@@ -458,29 +458,29 @@ services:
458458
logging: *logging
459459

460460
# Product Catalog service
461-
productcatalogservice:
462-
image: ${IMAGE_NAME}:${DEMO_VERSION}-productcatalogservice
463-
container_name: product-catalog-service
461+
product-catalog:
462+
image: ${IMAGE_NAME}:${DEMO_VERSION}-product-catalog
463+
container_name: product-catalog
464464
build:
465465
context: ./
466466
dockerfile: ${PRODUCT_CATALOG_DOCKERFILE}
467467
cache_from:
468-
- ${IMAGE_NAME}:${IMAGE_VERSION}-productcatalogservice
468+
- ${IMAGE_NAME}:${IMAGE_VERSION}-product-catalog
469469
deploy:
470470
resources:
471471
limits:
472472
memory: 20M
473473
restart: unless-stopped
474474
ports:
475-
- "${PRODUCT_CATALOG_SERVICE_PORT}"
475+
- "${PRODUCT_CATALOG_PORT}"
476476
environment:
477-
- PRODUCT_CATALOG_SERVICE_PORT
477+
- PRODUCT_CATALOG_PORT
478478
- FLAGD_HOST
479479
- FLAGD_PORT
480480
- OTEL_EXPORTER_OTLP_ENDPOINT
481481
- OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
482482
- OTEL_RESOURCE_ATTRIBUTES
483-
- OTEL_SERVICE_NAME=productcatalogservice
483+
- OTEL_SERVICE_NAME=product-catalog
484484
depends_on:
485485
otel-collector:
486486
condition: service_started
@@ -534,7 +534,7 @@ services:
534534
- "${RECOMMENDATION_PORT}"
535535
environment:
536536
- RECOMMENDATION_PORT
537-
- PRODUCT_CATALOG_SERVICE_ADDR
537+
- PRODUCT_CATALOG_ADDR
538538
- FLAGD_HOST
539539
- FLAGD_PORT
540540
- OTEL_PYTHON_LOG_CORRELATION=true
@@ -544,7 +544,7 @@ services:
544544
- OTEL_SERVICE_NAME=recommendation
545545
- PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
546546
depends_on:
547-
productcatalogservice:
547+
product-catalog:
548548
condition: service_started
549549
otel-collector:
550550
condition: service_started

‎docker-gen-proto.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ if [ -z "$1" ]; then
3939
#gen_proto_ruby email
4040
#gen_proto_ts frontend
4141
#gen_proto_js payment
42-
gen_proto_go productcatalogservice
42+
gen_proto_go product-catalog
4343
#gen_proto_php quote
4444
gen_proto_python recommendation
4545
#gen_proto_rust shipping

‎ide-gen-proto.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ gen_proto_go checkoutservice
7474
gen_proto_ts frontend
7575
gen_proto_ts react-native-app
7676
gen_proto_js payment
77-
gen_proto_go productcatalogservice
77+
gen_proto_go product-catalog
7878
# gen_proto_php quote
7979
gen_proto_python recommendation
8080
gen_proto_rust shipping

‎renovate.json5

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
"groupName": "payment",
7676
},
7777
{
78-
"matchFileNames": ["src/productcatalogservice/**"],
79-
"groupName": "productcatalogservice",
78+
"matchFileNames": ["src/product-catalog/**"],
79+
"groupName": "product-catalog",
8080
},
8181
{
8282
"matchFileNames": ["src/prometheus/**"],

‎src/checkoutservice/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ func main() {
172172
svc.shippingSvcClient = pb.NewShippingServiceClient(c)
173173
defer c.Close()
174174

175-
mustMapEnv(&svc.productCatalogSvcAddr, "PRODUCT_CATALOG_SERVICE_ADDR")
175+
mustMapEnv(&svc.productCatalogSvcAddr, "PRODUCT_CATALOG_ADDR")
176176
c = mustCreateClient(svc.productCatalogSvcAddr)
177177
svc.productCatalogSvcClient = pb.NewProductCatalogServiceClient(c)
178178
defer c.Close()

‎src/frontend/gateways/rpc/ProductCatalog.gateway.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import { ChannelCredentials } from '@grpc/grpc-js';
55
import { ListProductsResponse, Product, ProductCatalogServiceClient } from '../../protos/demo';
66

7-
const { PRODUCT_CATALOG_SERVICE_ADDR = '' } = process.env;
7+
const { PRODUCT_CATALOG_ADDR = '' } = process.env;
88

9-
const client = new ProductCatalogServiceClient(PRODUCT_CATALOG_SERVICE_ADDR, ChannelCredentials.createInsecure());
9+
const client = new ProductCatalogServiceClient(PRODUCT_CATALOG_ADDR, ChannelCredentials.createInsecure());
1010

1111
const ProductCatalogGateway = () => ({
1212
listProducts() {

‎src/frontend/next.config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const {
1717
CART_ADDR = '',
1818
CHECKOUT_SERVICE_ADDR = '',
1919
CURRENCY_ADDR = '',
20-
PRODUCT_CATALOG_SERVICE_ADDR = '',
20+
PRODUCT_CATALOG_ADDR = '',
2121
RECOMMENDATION_ADDR = '',
2222
SHIPPING_ADDR = '',
2323
ENV_PLATFORM = '',
@@ -49,7 +49,7 @@ const nextConfig = {
4949
CART_ADDR,
5050
CHECKOUT_SERVICE_ADDR,
5151
CURRENCY_ADDR,
52-
PRODUCT_CATALOG_SERVICE_ADDR,
52+
PRODUCT_CATALOG_ADDR,
5353
RECOMMENDATION_ADDR,
5454
SHIPPING_ADDR,
5555
OTEL_EXPORTER_OTLP_TRACES_ENDPOINT,

‎src/product-catalog/Dockerfile

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Copyright The OpenTelemetry Authors
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
5+
FROM golang:1.22-alpine AS builder
6+
7+
WORKDIR /usr/src/app/
8+
9+
RUN --mount=type=cache,target=/go/pkg/mod/ \
10+
--mount=type=bind,source=./src/product-catalog/go.sum,target=go.sum \
11+
--mount=type=bind,source=./src/product-catalog/go.mod,target=go.mod \
12+
go mod download
13+
14+
RUN --mount=type=cache,target=/go/pkg/mod/ \
15+
--mount=type=cache,target=/root/.cache/go-build \
16+
--mount=type=bind,rw,source=./src/product-catalog,target=. \
17+
go build -ldflags "-s -w" -o /go/bin/product-catalog/ ./
18+
19+
FROM alpine AS release
20+
21+
WORKDIR /usr/src/app/
22+
23+
COPY ./src/product-catalog/products/ ./products/
24+
COPY --from=builder /go/bin/product-catalog/ ./
25+
26+
EXPOSE ${PRODUCT_CATALOG_PORT}
27+
ENTRYPOINT [ "./product-catalog" ]

‎src/productcatalogservice/README.md ‎src/product-catalog/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ When this service is run the output should be similar to the following
1212
To build the service binary, run:
1313

1414
```sh
15-
go build -o /go/bin/productcatalogservice/
15+
go build -o /go/bin/product-catalog/
1616
```
1717

1818
## Docker Build
1919

2020
From the root directory, run:
2121

2222
```sh
23-
docker compose build productcatalogservice
23+
docker compose build product-catalog
2424
```
2525

2626
## Regenerate protos

‎src/productcatalogservice/genproto/Dockerfile ‎src/product-catalog/genproto/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ WORKDIR /build
77

88
RUN apk add --no-cache protobuf-dev
99

10-
COPY ./src/productcatalogservice/go.mod ./
11-
COPY ./src/productcatalogservice/go.sum ./
12-
COPY ./src/productcatalogservice/tools.go ./
10+
COPY ./src/product-catalog/go.mod ./
11+
COPY ./src/product-catalog/go.sum ./
12+
COPY ./src/product-catalog/tools.go ./
1313

1414
RUN go env -w GOMODCACHE=/root/.cache/go-build
1515
RUN --mount=type=cache,target=/root/.cache/go-build \

‎src/productcatalogservice/genproto/oteldemo/demo.pb.go ‎src/product-catalog/genproto/oteldemo/demo.pb.go

File renamed without changes.

‎src/productcatalogservice/genproto/oteldemo/demo_grpc.pb.go ‎src/product-catalog/genproto/oteldemo/demo_grpc.pb.go

File renamed without changes.

‎src/productcatalogservice/go.mod ‎src/product-catalog/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/opentelemetry/opentelemetry-demo/src/productcatalogservice
1+
module github.com/opentelemetry/opentelemetry-demo/src/product-catalog
22

33
go 1.22.7
44

‎src/productcatalogservice/go.sum ‎src/product-catalog/go.sum

File renamed without changes.

0 commit comments

Comments
 (0)