[accounting]: rename accountingservice to accounting (open-telemetry#…

…1827) * rename accountingservice to accounting * Add ignore protos back --------- Co-authored-by: Juliano Costa <juliano.costa@datadoghq.com>
julianocosta89 · Dec 12, 2024 · e54439d · e54439d
1 parent 5f28491
commit e54439d
Show file tree

Hide file tree

Showing 18 changed files with 34 additions and 32 deletions.
diff --git a/.env b/.env
@@ -46,7 +46,7 @@ OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE=cumulative
 # Core Demo Services
 # ******************
 # Accounting Service
-ACCOUNTING_SERVICE_DOCKERFILE=./src/accountingservice/Dockerfile
+ACCOUNTING_DOCKERFILE=./src/accounting/Dockerfile
 
 # Ad Service
 AD_SERVICE_PORT=9555

diff --git a/.github/workflows/component-build-images.yml b/.github/workflows/component-build-images.yml
@@ -51,8 +51,8 @@ jobs:
       fail-fast: false
       matrix:
         file_tag:
-          - file: ./src/accountingservice/Dockerfile
-            tag_suffix: accountingservice
+          - file: ./src/accounting/Dockerfile
+            tag_suffix: accounting
             context: ./
             setup-qemu: true
           - file: ./src/adservice/Dockerfile

diff --git a/.gitignore b/.gitignore
@@ -43,6 +43,7 @@ src/shippingservice/target/
 test/tracetesting/tracetesting-vars.yaml
 
 # Ignore copied/generated protobuf files
+/src/accounting/src/protos/
 /src/cartservice/src/protos/
 /src/featureflagservice/proto/
 /src/featureflagservice/src/ffs_demo_pb.erl
@@ -54,4 +55,3 @@ test/tracetesting/tracetesting-vars.yaml
 /src/paymentservice/demo.proto
 /src/shippingservice/proto/
 /src/currencyservice/proto
-/src/accountingservice/genproto
diff --git a/.licenserc.json b/.licenserc.json
@@ -38,7 +38,7 @@
     ],
     "ignore": [
         "node_modules/",
-        "src/accountingservice/genproto/",
+        "/src/accounting/src/protos/",
         "src/cartservice/src/obj/",
         "src/cartservice/tests/obj/",
         "src/checkoutservice/genproto/",

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,8 @@ the release.
   ([#1794](https://github.com/open-telemetry/opentelemetry-demo/pull/1784))
 * [paymentservice] Add nodejs instrumentation for runtime metrics
   ([#1797](https://github.com/open-telemetry/opentelemetry-demo/pull/1797))
+* [accounting] rename accountingservice to accounting
+  ([#1827](https://github.com/open-telemetry/opentelemetry-demo/pull/1827))
 
 ## 1.12.0
 

diff --git a/docker-compose-tests.yml b/docker-compose-tests.yml
@@ -57,7 +57,7 @@ services:
       tracetest-server:
         condition: service_healthy
       # adding demo services as dependencies
-      accountingservice:
+      accounting:
         condition: service_started
       adservice:
         condition: service_started

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -18,14 +18,14 @@ services:
   # Core Demo Services
   # ******************
   # Accounting service
-  accountingservice:
-    image: ${IMAGE_NAME}:${DEMO_VERSION}-accountingservice
-    container_name: accounting-service
+  accounting:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-accounting
+    container_name: accounting
     build:
       context: ./
-      dockerfile: ${ACCOUNTING_SERVICE_DOCKERFILE}
+      dockerfile: ${ACCOUNTING_DOCKERFILE}
       cache_from:
-        - ${IMAGE_NAME}:${IMAGE_VERSION}-accountingservice
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-accounting
     deploy:
       resources:
         limits:
@@ -36,7 +36,7 @@ services:
       - OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_HTTP}
       - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
       - OTEL_RESOURCE_ATTRIBUTES
-      - OTEL_SERVICE_NAME=accountingservice
+      - OTEL_SERVICE_NAME=accounting
     depends_on:
       otelcol:
         condition: service_started

diff --git a/docker-gen-proto.sh b/docker-gen-proto.sh
@@ -21,7 +21,7 @@ gen_proto_python() {
     python -m grpc_tools.protoc -I /build/pb/ --python_out="./src/$1/" --grpc_python_out="./src/$1/" /build/pb/demo.proto
 }
 
-#gen_proto_dotnet accountingservice
+#gen_proto_dotnet accounting
 #gen_proto_java adservice
 #gen_proto_dotnet cartservice
 gen_proto_go checkoutservice

diff --git a/ide-gen-proto.sh b/ide-gen-proto.sh
@@ -65,7 +65,7 @@ gen_proto_ts() {
   cd "$base_dir" || return
 }
 
-gen_proto_dotnet accountingservice
+gen_proto_dotnet accounting
 # gen_proto_java adservice
 gen_proto_dotnet cartservice
 gen_proto_go checkoutservice

diff --git a/renovate.json5 b/renovate.json5
@@ -15,8 +15,8 @@
 
   "packageRules": [
     {
-      "matchFileNames": ["src/accountingservice/**"],
-      "groupName": "accountingservice",
+      "matchFileNames": ["src/accounting/**"],
+      "groupName": "accounting",
     },
     {
       "matchFileNames": ["src/adservice/**"],

diff --git a/...ccountingservice/AccountingService.csproj → src/accounting/Accounting.csproj b/...ccountingservice/AccountingService.csproj → src/accounting/Accounting.csproj
diff --git a/src/accountingservice/AccountingService.sln → src/accounting/Accounting.sln b/src/accountingservice/AccountingService.sln → src/accounting/Accounting.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.9.34701.34
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AccountingService", "AccountingService.csproj", "{C66C35E2-DF04-4DCF-8F6A-87B6D6433FF6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Accounting", "Accounting.csproj", "{C66C35E2-DF04-4DCF-8F6A-87B6D6433FF6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/src/accountingservice/Consumer.cs → src/accounting/Consumer.cs b/src/accountingservice/Consumer.cs → src/accounting/Consumer.cs
@@ -5,7 +5,7 @@
 using Microsoft.Extensions.Logging;
 using Oteldemo;
 
-namespace AccountingService;
+namespace Accounting;
 
 internal class Consumer : IDisposable
 {
@@ -74,7 +74,7 @@ private IConsumer<string, byte[]> BuildConsumer(string servers)
     {
         var conf = new ConsumerConfig
         {
-            GroupId = $"accountingservice",
+            GroupId = $"accounting",
             BootstrapServers = servers,
             // https://github.com/confluentinc/confluent-kafka-dotnet/tree/07de95ed647af80a0db39ce6a8891a630423b952#basic-consumer-example
             AutoOffsetReset = AutoOffsetReset.Earliest,

diff --git a/src/accountingservice/Dockerfile → src/accounting/Dockerfile b/src/accountingservice/Dockerfile → src/accounting/Dockerfile
@@ -5,19 +5,19 @@ FROM --platform=${BUILDPLATFORM} mcr.microsoft.com/dotnet/sdk:8.0 AS builder
 ARG TARGETARCH
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
-COPY ["/src/accountingservice/", "AccountingService/"]
-COPY ["/pb/demo.proto", "AccountingService/proto/"]
-RUN dotnet restore "./AccountingService/AccountingService.csproj" -r linux-$TARGETARCH
-WORKDIR "/src/AccountingService"
+COPY ["/src/accounting/", "Accounting/"]
+COPY ["/pb/demo.proto", "Accounting/proto/"]
+RUN dotnet restore "./Accounting/Accounting.csproj" -r linux-$TARGETARCH
+WORKDIR "/src/Accounting"
 
-RUN dotnet build "./AccountingService.csproj" -r linux-$TARGETARCH -c $BUILD_CONFIGURATION -o /app/build
+RUN dotnet build "./Accounting.csproj" -r linux-$TARGETARCH -c $BUILD_CONFIGURATION -o /app/build
 
 # -----------------------------------------------------------------------------
 
 FROM builder AS publish
 ARG TARGETARCH
 ARG BUILD_CONFIGURATION=Release
-RUN dotnet publish "./AccountingService.csproj" -r linux-$TARGETARCH -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
+RUN dotnet publish "./Accounting.csproj" -r linux-$TARGETARCH -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
 
 # -----------------------------------------------------------------------------
 
@@ -32,4 +32,4 @@ RUN chown app "/var/log/opentelemetry/dotnet"
 RUN chown app "/app/instrument.sh"
 USER app
 
-ENTRYPOINT ["./instrument.sh", "dotnet", "AccountingService.dll"]
+ENTRYPOINT ["./instrument.sh", "dotnet", "Accounting.dll"]
diff --git a/src/accountingservice/Helpers.cs → src/accounting/Helpers.cs b/src/accountingservice/Helpers.cs → src/accounting/Helpers.cs
@@ -3,7 +3,7 @@
 
 using System.Collections;
 
-namespace AccountingService
+namespace Accounting
 {
     internal static class Helpers
     {

diff --git a/src/accountingservice/Log.cs → src/accounting/Log.cs b/src/accountingservice/Log.cs → src/accounting/Log.cs
@@ -4,7 +4,7 @@
 using Microsoft.Extensions.Logging;
 using Oteldemo;
 
-namespace AccountingService
+namespace Accounting
 {
     internal static partial class Log
     {

diff --git a/src/accountingservice/Program.cs → src/accounting/Program.cs b/src/accountingservice/Program.cs → src/accounting/Program.cs
@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using AccountingService;
+using Accounting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 

diff --git a/src/accountingservice/README.md → src/accounting/README.md b/src/accountingservice/README.md → src/accounting/README.md
@@ -7,7 +7,7 @@ This service consumes new orders from a Kafka topic.
 To build the service binary, run:
 
 ```sh
-cp pb/demo.proto src/accoutingservice/proto/demo.proto # root context
+cp pb/demo.proto src/accouting/proto/demo.proto # root context
 dotnet build # accounting service context
 ```
 
@@ -16,13 +16,13 @@ dotnet build # accounting service context
 From the root directory, run:
 
 ```sh
-docker compose build accountingservice
+docker compose build accounting
 ```
 
 ## Bump dependencies
 
 To bump all dependencies run in Package manager:
 
 ```sh
-Update-Package -ProjectName AccountingService
+Update-Package -ProjectName Accounting
 ```