Skip to content

Commit e3548c6

Browse files
puckpuckpuckpuck
authoredDec 22, 2024··
[currency] Rename currencyservice to currency (#1858)
·
2.0.22.0.0
1 parent d5c0efe commit e3548c6

28 files changed

+73
-71
lines changed
 

‎.dockerignore

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ src/*/Dockerfile
88
src/*/*/Dockerfile
99

1010
###################################
11-
# currencyservice
12-
./src/currencyservice/client.js
13-
./src/currencyservice/node_modules/
11+
# currency
12+
./src/currency/client.js
13+
./src/currency/node_modules/
1414
###################################
1515

1616
###################################

‎.env

+3-3
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ CHECKOUT_SERVICE_ADDR=checkoutservice:${CHECKOUT_SERVICE_PORT}
6464
CHECKOUT_SERVICE_DOCKERFILE=./src/checkoutservice/Dockerfile
6565

6666
# Currency Service
67-
CURRENCY_SERVICE_PORT=7001
68-
CURRENCY_SERVICE_ADDR=currencyservice:${CURRENCY_SERVICE_PORT}
69-
CURRENCY_SERVICE_DOCKERFILE=./src/currencyservice/Dockerfile
67+
CURRENCY_PORT=7001
68+
CURRENCY_ADDR=currency:${CURRENCY_PORT}
69+
CURRENCY_DOCKERFILE=./src/currency/Dockerfile
7070

7171
# Email Service
7272
EMAIL_SERVICE_PORT=6060

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ jobs:
6767
tag_suffix: checkoutservice
6868
context: ./
6969
setup-qemu: true
70-
- file: ./src/currencyservice/Dockerfile
71-
tag_suffix: currencyservice
70+
- file: ./src/currency/Dockerfile
71+
tag_suffix: currency
7272
context: ./
7373
setup-qemu: true
7474
- file: ./src/emailservice/Dockerfile

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ test/tracetesting/tracetesting-vars.yaml
5454
/src/frontend/protos/
5555
/src/paymentservice/demo.proto
5656
/src/shipping/proto/
57-
/src/currencyservice/proto
57+
/src/currency/proto
5858

5959
# Android
6060
*.apk

‎CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ the release.
5454
([#1856](https://github.com/open-telemetry/opentelemetry-demo/pull/1856))
5555
* [image-provider] rename imageprovider to image-provider
5656
([#1857](https://github.com/open-telemetry/opentelemetry-demo/pull/1857))
57+
* [currency] rename currencyservice to currency
58+
([#1858](https://github.com/open-telemetry/opentelemetry-demo/pull/1858))
5759

5860
## 1.12.0
5961

‎docker-compose-tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ services:
4040
- AD_ADDR
4141
- CART_ADDR
4242
- CHECKOUT_SERVICE_ADDR
43-
- CURRENCY_SERVICE_ADDR
43+
- CURRENCY_ADDR
4444
- EMAIL_SERVICE_ADDR
4545
- FRONTEND_ADDR
4646
- PAYMENT_SERVICE_ADDR
@@ -65,7 +65,7 @@ services:
6565
condition: service_started
6666
checkoutservice:
6767
condition: service_started
68-
currencyservice:
68+
currency:
6969
condition: service_started
7070
emailservice:
7171
condition: service_started

‎docker-compose.minimal.yml

+11-11
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ services:
9999
environment:
100100
- CHECKOUT_SERVICE_PORT
101101
- CART_ADDR
102-
- CURRENCY_SERVICE_ADDR
102+
- CURRENCY_ADDR
103103
- EMAIL_SERVICE_ADDR
104104
- FLAGD_HOST
105105
- PAYMENT_SERVICE_ADDR
@@ -112,7 +112,7 @@ services:
112112
depends_on:
113113
cart:
114114
condition: service_started
115-
currencyservice:
115+
currency:
116116
condition: service_started
117117
emailservice:
118118
condition: service_started
@@ -127,14 +127,14 @@ services:
127127
logging: *logging
128128

129129
# Currency service
130-
currencyservice:
131-
image: ${IMAGE_NAME}:${DEMO_VERSION}-currencyservice
130+
currency:
131+
image: ${IMAGE_NAME}:${DEMO_VERSION}-currency
132132
container_name: currency-service
133133
build:
134134
context: ./
135-
dockerfile: ${CURRENCY_SERVICE_DOCKERFILE}
135+
dockerfile: ${CURRENCY_DOCKERFILE}
136136
cache_from:
137-
- ${IMAGE_NAME}:${IMAGE_VERSION}-currencyservice
137+
- ${IMAGE_NAME}:${IMAGE_VERSION}-currency
138138
args:
139139
OPENTELEMETRY_CPP_VERSION: ${OPENTELEMETRY_CPP_VERSION}
140140
deploy:
@@ -143,12 +143,12 @@ services:
143143
memory: 20M
144144
restart: unless-stopped
145145
ports:
146-
- "${CURRENCY_SERVICE_PORT}"
146+
- "${CURRENCY_PORT}"
147147
environment:
148-
- CURRENCY_SERVICE_PORT
148+
- CURRENCY_PORT
149149
- VERSION=${IMAGE_VERSION}
150150
- OTEL_EXPORTER_OTLP_ENDPOINT
151-
- OTEL_RESOURCE_ATTRIBUTES=${OTEL_RESOURCE_ATTRIBUTES},service.name=currencyservice # The C++ SDK does not support OTEL_SERVICE_NAME
151+
- OTEL_RESOURCE_ATTRIBUTES=${OTEL_RESOURCE_ATTRIBUTES},service.name=currency # The C++ SDK does not support OTEL_SERVICE_NAME
152152
depends_on:
153153
otel-collector:
154154
condition: service_started
@@ -202,7 +202,7 @@ services:
202202
- AD_ADDR
203203
- CART_ADDR
204204
- CHECKOUT_SERVICE_ADDR
205-
- CURRENCY_SERVICE_ADDR
205+
- CURRENCY_ADDR
206206
- PRODUCT_CATALOG_SERVICE_ADDR
207207
- RECOMMENDATION_SERVICE_ADDR
208208
- SHIPPING_ADDR
@@ -223,7 +223,7 @@ services:
223223
condition: service_started
224224
checkoutservice:
225225
condition: service_started
226-
currencyservice:
226+
currency:
227227
condition: service_started
228228
productcatalogservice:
229229
condition: service_started

‎docker-compose.yml

+11-11
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ services:
133133
- FLAGD_PORT
134134
- CHECKOUT_SERVICE_PORT
135135
- CART_ADDR
136-
- CURRENCY_SERVICE_ADDR
136+
- CURRENCY_ADDR
137137
- EMAIL_SERVICE_ADDR
138138
- PAYMENT_SERVICE_ADDR
139139
- PRODUCT_CATALOG_SERVICE_ADDR
@@ -146,7 +146,7 @@ services:
146146
depends_on:
147147
cart:
148148
condition: service_started
149-
currencyservice:
149+
currency:
150150
condition: service_started
151151
emailservice:
152152
condition: service_started
@@ -165,14 +165,14 @@ services:
165165
logging: *logging
166166

167167
# Currency service
168-
currencyservice:
169-
image: ${IMAGE_NAME}:${DEMO_VERSION}-currencyservice
168+
currency:
169+
image: ${IMAGE_NAME}:${DEMO_VERSION}-currency
170170
container_name: currency-service
171171
build:
172172
context: ./
173-
dockerfile: ${CURRENCY_SERVICE_DOCKERFILE}
173+
dockerfile: ${CURRENCY_DOCKERFILE}
174174
cache_from:
175-
- ${IMAGE_NAME}:${IMAGE_VERSION}-currencyservice
175+
- ${IMAGE_NAME}:${IMAGE_VERSION}-currency
176176
args:
177177
OPENTELEMETRY_CPP_VERSION: ${OPENTELEMETRY_CPP_VERSION}
178178
deploy:
@@ -181,12 +181,12 @@ services:
181181
memory: 20M
182182
restart: unless-stopped
183183
ports:
184-
- "${CURRENCY_SERVICE_PORT}"
184+
- "${CURRENCY_PORT}"
185185
environment:
186-
- CURRENCY_SERVICE_PORT
186+
- CURRENCY_PORT
187187
- VERSION=${IMAGE_VERSION}
188188
- OTEL_EXPORTER_OTLP_ENDPOINT
189-
- OTEL_RESOURCE_ATTRIBUTES=${OTEL_RESOURCE_ATTRIBUTES},service.name=currencyservice # The C++ SDK does not support OTEL_SERVICE_NAME
189+
- OTEL_RESOURCE_ATTRIBUTES=${OTEL_RESOURCE_ATTRIBUTES},service.name=currency # The C++ SDK does not support OTEL_SERVICE_NAME
190190
depends_on:
191191
otel-collector:
192192
condition: service_started
@@ -274,7 +274,7 @@ services:
274274
- AD_ADDR
275275
- CART_ADDR
276276
- CHECKOUT_SERVICE_ADDR
277-
- CURRENCY_SERVICE_ADDR
277+
- CURRENCY_ADDR
278278
- PRODUCT_CATALOG_SERVICE_ADDR
279279
- RECOMMENDATION_SERVICE_ADDR
280280
- SHIPPING_ADDR
@@ -295,7 +295,7 @@ services:
295295
condition: service_started
296296
checkoutservice:
297297
condition: service_started
298-
currencyservice:
298+
currency:
299299
condition: service_started
300300
productcatalogservice:
301301
condition: service_started

‎docker-gen-proto.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ gen_proto_python() {
2525
#gen_proto_java ad
2626
#gen_proto_dotnet cart
2727
gen_proto_go checkoutservice
28-
#gen_proto_cpp currencyservice
28+
#gen_proto_cpp currency
2929
#gen_proto_ruby emailservice
3030
#gen_proto_ts frontend
3131
#gen_proto_js paymentservice

‎ide-gen-proto.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ gen_proto_dotnet accounting
6969
# gen_proto_java ad
7070
gen_proto_dotnet cart
7171
gen_proto_go checkoutservice
72-
# gen_proto_cpp currencyservice
72+
# gen_proto_cpp currency
7373
# gen_proto_ruby emailservice
7474
gen_proto_ts frontend
7575
gen_proto_ts react-native-app

‎renovate.json5

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
"groupName": "checkoutservice",
3232
},
3333
{
34-
"matchFileNames": ["src/currencyservice/**"],
35-
"groupName": "currencyservice",
34+
"matchFileNames": ["src/currency/**"],
35+
"groupName": "currency",
3636
},
3737
{
3838
"matchFileNames": ["src/emailservice/**"],

‎src/checkoutservice/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ func main() {
182182
svc.cartSvcClient = pb.NewCartServiceClient(c)
183183
defer c.Close()
184184

185-
mustMapEnv(&svc.currencySvcAddr, "CURRENCY_SERVICE_ADDR")
185+
mustMapEnv(&svc.currencySvcAddr, "CURRENCY_ADDR")
186186
c = mustCreateClient(svc.currencySvcAddr)
187187
svc.currencySvcClient = pb.NewCurrencyServiceClient(c)
188188
defer c.Close()

‎src/currencyservice/.dockerignore ‎src/currency/.dockerignore

File renamed without changes.

‎src/currencyservice/CMakeLists.txt ‎src/currency/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@ add_library(demo-proto ${DEMO_PB_H_FILE}
5959
target_link_libraries(demo-proto gRPC::grpc++ protobuf::libprotobuf)
6060
include_directories("${GENERATED_PROTOBUF_PATH}" "${OPENTELEMETRY_CPP_INCLUDE_DIRS}")
6161

62-
add_executable(currencyservice src/server.cpp)
63-
add_dependencies(currencyservice demo-proto)
62+
add_executable(currency src/server.cpp)
63+
add_dependencies(currency demo-proto)
6464
target_link_libraries(
65-
currencyservice demo-proto protobuf::libprotobuf
65+
currency demo-proto protobuf::libprotobuf
6666
${OPENTELEMETRY_CPP_LIBRARIES} opentelemetry_trace opentelemetry_common
6767
opentelemetry_exporter_otlp_grpc opentelemetry_exporter_otlp_grpc_client
6868
opentelemetry_proto opentelemetry_otlp_recordable opentelemetry_resources
6969
opentelemetry_metrics opentelemetry_exporter_otlp_grpc_metrics gRPC::grpc++)
7070

71-
install(TARGETS currencyservice DESTINATION bin)
71+
install(TARGETS currency DESTINATION bin)

‎src/currencyservice/Dockerfile ‎src/currency/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ RUN git clone https://github.com/open-telemetry/opentelemetry-cpp \
3030
-DWITH_EXAMPLES=OFF -DWITH_OTLP_GRPC=ON -DWITH_ABSEIL=ON \
3131
&& make -j$(nproc || sysctl -n hw.ncpu || echo 1) install && cd ../..
3232

33-
COPY ./src/currencyservice /currencyservice
34-
COPY ./pb/demo.proto /currencyservice/proto/demo.proto
33+
COPY ./src/currency /currency
34+
COPY ./pb/demo.proto /currency/proto/demo.proto
3535

36-
RUN cd /currencyservice \
36+
RUN cd /currency \
3737
&& mkdir -p build && cd build \
3838
&& cmake .. \
3939
&& make -j$(nproc || sysctl -n hw.ncpu || echo 1) install
@@ -44,5 +44,5 @@ FROM alpine:3.18 AS release
4444
RUN apk update && apk add grpc-dev protobuf-dev
4545
COPY --from=builder /usr/local /usr/local
4646

47-
EXPOSE ${CURRENCY_SERVICE_PORT}
48-
ENTRYPOINT ["sh", "-c", "./usr/local/bin/currencyservice ${CURRENCY_SERVICE_PORT}"]
47+
EXPOSE ${CURRENCY_PORT}
48+
ENTRYPOINT ["sh", "-c", "./usr/local/bin/currency ${CURRENCY_PORT}"]

‎src/currencyservice/README.md ‎src/currency/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ To build the currency service, run the following from root directory
99
of opentelemetry-demo
1010

1111
```sh
12-
docker-compose build currencyservice
12+
docker-compose build currency
1313
```
1414

1515
## Run the service
1616

1717
Execute the below command to run the service.
1818

1919
```sh
20-
docker-compose up currencyservice
20+
docker-compose up currency
2121
```
2222

2323
## Run the client
@@ -29,4 +29,4 @@ service. To run the client, execute the below command.
2929
docker exec -it <container_name> currencyclient 7000
3030
```
3131

32-
'7000' is port where currencyservice listens to.
32+
'7000' is port where currency listens to.

‎src/currencyservice/src/logger_common.h ‎src/currency/src/logger_common.h

File renamed without changes.

‎src/currencyservice/src/meter_common.h ‎src/currency/src/meter_common.h

File renamed without changes.

‎src/currencyservice/src/server.cpp ‎src/currency/src/server.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ namespace
8383
};
8484

8585
std::string version = std::getenv("VERSION");
86-
std::string name{ "currencyservice" };
86+
std::string name{ "currency" };
8787

8888
nostd::unique_ptr<metrics_api::Counter<uint64_t>> currency_counter;
8989
nostd::shared_ptr<opentelemetry::logs::Logger> logger;
@@ -115,15 +115,15 @@ class CurrencyService final : public oteldemo::CurrencyService::Service
115115
auto new_context = prop->Extract(carrier, current_ctx);
116116
options.parent = GetSpan(new_context)->GetContext();
117117

118-
std::string span_name = "CurrencyService/GetSupportedCurrencies";
118+
std::string span_name = "Currency/GetSupportedCurrencies";
119119
auto span =
120-
get_tracer("currencyservice")->StartSpan(span_name,
120+
get_tracer("currency")->StartSpan(span_name,
121121
{{SemanticConventions::kRpcSystem, "grpc"},
122122
{SemanticConventions::kRpcService, "oteldemo.CurrencyService"},
123123
{SemanticConventions::kRpcMethod, "GetSupportedCurrencies"},
124124
{SemanticConventions::kRpcGrpcStatusCode, 0}},
125125
options);
126-
auto scope = get_tracer("currencyservice")->WithActiveSpan(span);
126+
auto scope = get_tracer("currency")->WithActiveSpan(span);
127127

128128
span->AddEvent("Processing supported currencies request");
129129

@@ -176,15 +176,15 @@ class CurrencyService final : public oteldemo::CurrencyService::Service
176176
auto new_context = prop->Extract(carrier, current_ctx);
177177
options.parent = GetSpan(new_context)->GetContext();
178178

179-
std::string span_name = "CurrencyService/Convert";
179+
std::string span_name = "Currency/Convert";
180180
auto span =
181-
get_tracer("currencyservice")->StartSpan(span_name,
181+
get_tracer("currency")->StartSpan(span_name,
182182
{{SemanticConventions::kRpcSystem, "grpc"},
183183
{SemanticConventions::kRpcService, "oteldemo.CurrencyService"},
184184
{SemanticConventions::kRpcMethod, "Convert"},
185185
{SemanticConventions::kRpcGrpcStatusCode, 0}},
186186
options);
187-
auto scope = get_tracer("currencyservice")->WithActiveSpan(span);
187+
auto scope = get_tracer("currency")->WithActiveSpan(span);
188188

189189
span->AddEvent("Processing currency conversion request");
190190

@@ -257,7 +257,7 @@ void RunServer(uint16_t port)
257257
int main(int argc, char **argv) {
258258

259259
if (argc < 2) {
260-
std::cout << "Usage: currencyservice <port>";
260+
std::cout << "Usage: currency <port>";
261261
return 0;
262262
}
263263

‎src/currencyservice/src/tracer_common.h ‎src/currency/src/tracer_common.h

File renamed without changes.

‎src/frontend/gateways/rpc/Currency.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 { GetSupportedCurrenciesResponse, CurrencyServiceClient, Money } from '../../protos/demo';
66

7-
const { CURRENCY_SERVICE_ADDR = '' } = process.env;
7+
const { CURRENCY_ADDR = '' } = process.env;
88

9-
const client = new CurrencyServiceClient(CURRENCY_SERVICE_ADDR, ChannelCredentials.createInsecure());
9+
const client = new CurrencyServiceClient(CURRENCY_ADDR, ChannelCredentials.createInsecure());
1010

1111
const CurrencyGateway = () => ({
1212
convert(from: Money, toCode: string) {

‎src/frontend/next.config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const {
1616
AD_ADDR = '',
1717
CART_ADDR = '',
1818
CHECKOUT_SERVICE_ADDR = '',
19-
CURRENCY_SERVICE_ADDR = '',
19+
CURRENCY_ADDR = '',
2020
PRODUCT_CATALOG_SERVICE_ADDR = '',
2121
RECOMMENDATION_SERVICE_ADDR = '',
2222
SHIPPING_ADDR = '',
@@ -48,7 +48,7 @@ const nextConfig = {
4848
AD_ADDR,
4949
CART_ADDR,
5050
CHECKOUT_SERVICE_ADDR,
51-
CURRENCY_SERVICE_ADDR,
51+
CURRENCY_ADDR,
5252
PRODUCT_CATALOG_SERVICE_ADDR,
5353
RECOMMENDATION_SERVICE_ADDR,
5454
SHIPPING_ADDR,

‎test/tracetesting/currencyservice/all.yaml ‎test/tracetesting/currency/all.yaml

File renamed without changes.

‎test/tracetesting/currencyservice/convert.yaml ‎test/tracetesting/currency/convert.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spec:
1010
type: grpc
1111
grpc:
1212
protobufFile: ../../../pb/demo.proto
13-
address: ${var:CURRENCY_SERVICE_ADDR}
13+
address: ${var:CURRENCY_ADDR}
1414
method: oteldemo.CurrencyService.Convert
1515
request: |-
1616
{
@@ -23,7 +23,7 @@ spec:
2323
}
2424
specs:
2525
- name: It converts from USD to CAD
26-
selector: span[tracetest.span.type="rpc" name="CurrencyService/Convert" rpc.system="grpc"
26+
selector: span[tracetest.span.type="rpc" name="Currency/Convert" rpc.system="grpc"
2727
rpc.method="Convert" rpc.service="oteldemo.CurrencyService"]
2828
assertions:
2929
- attr:app.currency.conversion.from = "USD"

‎test/tracetesting/currencyservice/supported.yaml ‎test/tracetesting/currency/supported.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ spec:
1010
type: grpc
1111
grpc:
1212
protobufFile: ../../../pb/demo.proto
13-
address: ${var:CURRENCY_SERVICE_ADDR}
13+
address: ${var:CURRENCY_ADDR}
1414
method: oteldemo.CurrencyService.GetSupportedCurrencies
1515
specs:
16-
- name: It has a span called "CurrencyService/GetSupportedCurrencies"
17-
selector: span[tracetest.span.type="rpc" name="CurrencyService/GetSupportedCurrencies"
16+
- name: It has a span called "Currency/GetSupportedCurrencies"
17+
selector: span[tracetest.span.type="rpc" name="Currency/GetSupportedCurrencies"
1818
rpc.system="grpc" rpc.method="GetSupportedCurrencies" rpc.service="oteldemo.CurrencyService"]
1919
assertions:
20-
- attr:name = "CurrencyService/GetSupportedCurrencies"
20+
- attr:name = "Currency/GetSupportedCurrencies"
2121
- name: It returns the expected currency codes
2222
selector: span[tracetest.span.type="general" name="Tracetest trigger"]
2323
assertions:

‎test/tracetesting/run.bash

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
set -e
99

1010
# Availalble services to test
11-
ALL_SERVICES=("ad" "cart" "currencyservice" "checkoutservice" "frontend" "emailservice" "paymentservice" "productcatalogservice" "recommendationservice" "shipping")
11+
ALL_SERVICES=("ad" "cart" "currency" "checkoutservice" "frontend" "emailservice" "paymentservice" "productcatalogservice" "recommendationservice" "shipping")
1212

1313
## Script variables
1414
# Will contain the list of services to test
@@ -40,8 +40,8 @@ spec:
4040
value: $CART_ADDR
4141
- key: CHECKOUT_SERVICE_ADDR
4242
value: $CHECKOUT_SERVICE_ADDR
43-
- key: CURRENCY_SERVICE_ADDR
44-
value: $CURRENCY_SERVICE_ADDR
43+
- key: CURRENCY_ADDR
44+
value: $CURRENCY_ADDR
4545
- key: EMAIL_SERVICE_ADDR
4646
value: $EMAIL_SERVICE_ADDR
4747
- key: FRONTEND_ADDR

0 commit comments

Comments
 (0)
Please sign in to comment.