feat: renew ChatApp docker for MagicOnionv4

Cysharp · Nov 17, 2020 · 315e379 · 315e379
1 parent 013ae7d
commit 315e379
Show file tree

Hide file tree

Showing 20 changed files with 125 additions and 79 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,32 @@
+.git/
+.vs/
+bin/
+obj/
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.gitattributes
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/azds.yaml
+**/charts
+**/bin
+**/obj
+**/Dockerfile
+**/Dockerfile.develop
+**/docker-compose.yml
+**/docker-compose.*.yml
+**/*.dbmdl
+**/*.jfm
+**/secrets.dev.yaml
+**/values.dev.yaml
+**/.toolstarget
+
+.github/
+docs/
+samples/ChatApp/ChatApp.Unity/Temp/
+samples/ChatApp/ChatApp.Unity/Library/
+sandbox/
+tests/
diff --git a/.gitignore b/.gitignore
@@ -123,4 +123,4 @@ nuget/*.unitypackage
 .idea/
 src/MagicOnion.Client.Unity/Packages/manifest.json
 
-packages
+packages
diff --git a/samples/ChatApp.Telemetry/.dockerignore b/samples/ChatApp.Telemetry/.dockerignore
@@ -24,5 +24,9 @@ obj/
 **/values.dev.yaml
 **/.toolstarget
 
-ChatApp.Unity/Temp/
-ChatApp.Unity/Library/
+docs/
+samples/ChatApp/
+samples/ChatApp.Telemetry/ChatApp.Unity/Temp/
+samples/ChatApp.Telemetry/ChatApp.Unity/Library/
+sandbox/
+tests/
diff --git a/samples/ChatApp.Telemetry/ChatApp.Server/ChatApp.Server.csproj b/samples/ChatApp.Telemetry/ChatApp.Server/ChatApp.Server.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 

diff --git a/samples/ChatApp.Telemetry/ChatApp.Server/ChatHub.cs b/samples/ChatApp.Telemetry/ChatApp.Server/ChatHub.cs
@@ -1,12 +1,11 @@
 using ChatApp.Shared.Hubs;
 using ChatApp.Shared.MessagePackObjects;
-using MagicOnion.Server;
 using MagicOnion.Server.Hubs;
+using MagicOnion.Server.OpenTelemetry;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading.Tasks;
-using MagicOnion.Server.OpenTelemetry;
 
 namespace ChatApp.Server
 {
@@ -22,7 +21,7 @@ public class ChatHub : StreamingHubBase<IChatHub, IChatHubReceiver>, IChatHub
         private readonly ActivitySource mysqlActivity;
         private readonly ActivitySource redisActivity;
 
-        public ChatHub(MagicOnionActivitySources magiconionActivity, BackendActivitySources backendActivity, MagicOnionOpenTelemetryOptions options)
+        public ChatHub(MagicOnionActivitySources magiconionActivity, BackendActivitySources backendActivity)
         {
             this.magiconionActivity = magiconionActivity.Current;
             this.mysqlActivity = backendActivity.Get("mysql");

diff --git a/samples/ChatApp.Telemetry/ChatApp.Server/ChatService.cs b/samples/ChatApp.Telemetry/ChatApp.Server/ChatService.cs
@@ -11,20 +11,20 @@ namespace ChatApp.Server
 {
     public class ChatService : ServiceBase<IChatService>, IChatService
     {
-        private ActivitySource activitySource;
+        private ActivitySource mysqlActivitySource;
         private ILogger logger;
 
-        public ChatService(ILogger<ChatService> logger, ActivitySource activitySource)
+        public ChatService(ILogger<ChatService> logger, BackendActivitySources backendActivity)
         {
-            this.activitySource = activitySource;
+            this.mysqlActivitySource = backendActivity.Get("mysql");
             this.logger = logger;
         }
 
         public async UnaryResult<Nil> GenerateException(string message)
         {
             var ex = new System.NotImplementedException();
             // dummy external operation.
-            using (var activity = activitySource.StartActivity("db:errors/insert", ActivityKind.Internal))
+            using (var activity = mysqlActivitySource.StartActivity("db:errors/insert", ActivityKind.Internal))
             {
                 // this is sample. use orm or any safe way.
                 activity.SetTag("table", "errors");

diff --git a/samples/ChatApp.Telemetry/ChatApp.Server/Dockerfile b/samples/ChatApp.Telemetry/ChatApp.Server/Dockerfile
@@ -1,8 +1,8 @@
-FROM mcr.microsoft.com/dotnet/core/runtime:3.1 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base
 EXPOSE 12345
 WORKDIR /app
 
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
 WORKDIR /src
 COPY ["ChatApp.Server/ChatApp.Server.csproj", "ChatApp.Server/"]
 COPY ["ChatApp.Shared/ChatApp.Shared.csproj", "ChatApp.Shared/"]

diff --git a/samples/ChatApp.Telemetry/ChatApp.Server/Dockerfile.full b/samples/ChatApp.Telemetry/ChatApp.Server/Dockerfile.full
@@ -0,0 +1,25 @@
+FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base
+EXPOSE 12345
+WORKDIR /app
+
+FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
+WORKDIR /src
+COPY ["samples/ChatApp.Telemetry/ChatApp.Server/ChatApp.Server.csproj", "samples/ChatApp.Telemetry/ChatApp.Server/"]
+COPY ["samples/ChatApp.Telemetry/ChatApp.Shared/ChatApp.Shared.csproj", "samples/ChatApp.Telemetry/ChatApp.Shared/"]
+COPY ["src/MagicOnion/MagicOnion.csproj", "src/MagicOnion/"]
+COPY ["src/MagicOnion.Abstractions/MagicOnion.Abstractions.csproj", "src/MagicOnion.Abstractions/"]
+COPY ["src/MagicOnion.Server/MagicOnion.Server.csproj", "src/MagicOnion.Server/"]
+COPY ["src/MagicOnion.Server.OpenTelemetry/MagicOnion.Server.OpenTelemetry.csproj", "src/MagicOnion.Server.OpenTelemetry/"]
+COPY ["src/MagicOnion.Shared/MagicOnion.Shared.csproj", "src/MagicOnion.Shared/"]
+RUN dotnet restore "samples/ChatApp.Telemetry/ChatApp.Server/ChatApp.Server.csproj"
+COPY . .
+WORKDIR "/src/samples/ChatApp.Telemetry/ChatApp.Server"
+RUN dotnet build "ChatApp.Server.csproj" -c Debug -o /app
+
+FROM build AS publish
+RUN dotnet publish "ChatApp.Server.csproj" -c Debug -o /app
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app .
+ENTRYPOINT ["dotnet", "ChatApp.Server.dll"]
diff --git a/samples/ChatApp.Telemetry/ChatApp.Server/PrometheusExporterMetricsService.cs b/samples/ChatApp.Telemetry/ChatApp.Server/PrometheusExporterMetricsService.cs
@@ -14,23 +14,21 @@ sealed class PrometheusExporterMetricsService : IHostedService
         private readonly PrometheusExporterMetricsHttpServerCustom server;
         private readonly ILogger<PrometheusExporterMetricsService> logger;
         private readonly MagicOnionOpenTelemetryOptions options;
-        private readonly string metricsExporterHostingEndpoint;
 
         public PrometheusExporterMetricsService(MetricExporter exporter, MagicOnionOpenTelemetryOptions options, IConfiguration configuration, ILogger<PrometheusExporterMetricsService> logger)
         {
             this.logger = logger;
             this.options = options;
             if (exporter is PrometheusExporter prometheusExporter)
             {
-                metricsExporterHostingEndpoint = options.MetricsExporterHostingEndpoint;
-                server = new PrometheusExporterMetricsHttpServerCustom(prometheusExporter, metricsExporterHostingEndpoint);
+                server = new PrometheusExporterMetricsHttpServerCustom(prometheusExporter, options.MetricsExporterHostingEndpoint);
             }
         }
         public Task StartAsync(CancellationToken cancellationToken)
         {
             if (server != null)
             {
-                logger.LogInformation($"PrometheusExporter MetricsServer is listening on: {metricsExporterHostingEndpoint}, sending to {options.MetricsExporterEndpoint}");
+                logger.LogInformation($"PrometheusExporter MetricsServer is listening on: {options.MetricsExporterHostingEndpoint}, sending to {options.MetricsExporterEndpoint}");
                 server.Start();
             }
             return Task.CompletedTask;

diff --git a/samples/ChatApp.Telemetry/ChatApp.Server/Startup.cs b/samples/ChatApp.Telemetry/ChatApp.Server/Startup.cs
@@ -98,6 +98,7 @@ public void ConfigureServices(IServiceCollection services)
                 .Build();
             services.AddSingleton(new BackendActivitySources(new[] { new ActivitySource("mysql"), new ActivitySource("redis") }));
 
+            // host Prometheus Metrics Server
             services.AddHostedService<PrometheusExporterMetricsService>();
         }
 

diff --git a/samples/ChatApp.Telemetry/ChatApp.Server/appsettings.Development.json b/samples/ChatApp.Telemetry/ChatApp.Server/appsettings.Development.json
@@ -2,19 +2,6 @@
   "MagicOnion": {
     "Service": {
       "IsReturnExceptionStackTraceInErrorDetail": true
-    },
-    "ServerPorts": [
-      {
-        "Host": "localhost",
-        "Port": 12345,
-        "UseInsecureConnection": true
-      }
-    ],
-    "OpenTelemetry": {
-        "ServiceName": "ChatApp.Server",
-        "MetricsExporterEndpoint": "http://127.0.0.1:9184/metrics/",
-        "TracerExporterEndpoint": "http://127.0.0.1:9411/api/v2/spans",
-        "PrometheusMetricsHostingEndpoint": "http://127.0.0.1:9184/metrics/"
     }
   }
 }
diff --git a/samples/ChatApp.Telemetry/ChatApp.Server/appsettings.json b/samples/ChatApp.Telemetry/ChatApp.Server/appsettings.json
@@ -1,12 +1,5 @@
 {
   "MagicOnion": {
-    "ServerPorts": [
-      {
-        "Host": "0.0.0.0",
-        "Port": 12345,
-        "UseInsecureConnection": true
-      }
-    ],
     "OpenTelemetry": {
       "MagicOnionActivityName": "chatapp.server",
       "MetricsExporterEndpoint": "http://127.0.0.1:9184/metrics/",

diff --git a/samples/ChatApp.Telemetry/docker-compose.telemetry.yaml b/samples/ChatApp.Telemetry/docker-compose.telemetry.yaml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   prometheus:
-    image: prom/prometheus:v2.11.1
+    image: prom/prometheus:v2.22.2
     volumes:
       # persistent prometheus database
       - ./docker/prometheus/data/:/prometheus
@@ -11,7 +11,15 @@ services:
     ports:
       - "9090:9090"
 
-  # # if you want monitor linux host machine, install node-exporter or use it through container.
+  alertmanager:
+    image: prom/alertmanager:v0.21.0
+    volumes:
+      - ./docker/alertmanager/config.yml:/etc/alertmanager/config.yml
+    command: "--config.file=/etc/alertmanager/config.yml"
+    ports:
+      - 9093:9093
+
+  # # if you want monitor linux host machine, install node-exporter or use container.
   # # settings detail: https://qiita.com/kanga/items/21acb042237f8a27f437
   # node-exporter:
   #   image: prom/node-exporter:latest
@@ -45,15 +53,13 @@ services:
     ports:
       - 3000:3000
 
-  alertmanager:
-    image: prom/alertmanager
-    volumes:
-      - ./docker/alertmanager/config.yml:/etc/alertmanager/config.yml
-    command: "--config.file=/etc/alertmanager/config.yml"
-    ports:
-      - 9093:9093
-
   zipkin:
-    image: openzipkin/zipkin
+    image: openzipkin/zipkin:2.22
     ports:
       - 9411:9411
+
+  jaeger:
+    image: jaegertracing/all-in-one:1.20
+    ports:
+      - 6831:6831/udp # client post
+      - 16686:16686 # web
diff --git a/samples/ChatApp.Telemetry/docker-compose.yaml b/samples/ChatApp.Telemetry/docker-compose.yaml
@@ -2,13 +2,14 @@ version: "3"
 
 services:
   magiconion:
-    image: cysharp/magiconion_sample_chatapp_telemetry:3.0.13
+    image: cysharp/magiconion_sample_chatapp_telemetry:4.0.1-0.8.0.beta1
     ports:
-      - 12345:12345
+      - 5000:80
       - 9184:9184
     environment:
       - DOTNET_ENVIRONMENT=Development
-      - MagicOnion__ServerPorts__0__Host=0.0.0.0
       - MagicOnion__OpenTelemetry__MetricsExporterEndpoint=http://127.0.0.1:9184/metrics/
-      - MagicOnion__OpenTelemetry__TracerExporterEndpoint=http://zipkin:9411/api/v2/spans
-      - MagicOnion__OpenTelemetry__PrometheusMetricsHostingEndpoint=http://+:9184/metrics/
+      - MagicOnion__OpenTelemetry__MetricsExporterHostingEndpoint=http://+:9184/metrics/
+      - UseExporter=jaeger
+      - Jaeger__Host=jaeger
+      - Zipkin__Endpoint=http://zipkin:9411/api/v2/spans
diff --git a/samples/ChatApp.Telemetry/docker/grafana/Dockerfile b/samples/ChatApp.Telemetry/docker/grafana/Dockerfile
@@ -1,3 +1,3 @@
-FROM grafana/grafana:latest-ubuntu
+FROM grafana/grafana:7.3.2-ubuntu
 COPY ["./docker/grafana/download_dashboards.sh", "/etc/grafana/download_dashboards.sh"]
 RUN mkdir -p /var/tmp/grafana/dashboards/default && /bin/sh /etc/grafana/download_dashboards.sh
diff --git a/samples/ChatApp.Telemetry/docker_push.bat b/samples/ChatApp.Telemetry/docker_push.bat
@@ -1,6 +1,6 @@
 :: cysharp/magiconion_sample_chatapp_telemetry
-docker-compose -f docker-compose.yaml build magiconion
+docker build -t chatapp_magiconion:latest -f ChatApp.Server/Dockerfile .
 docker tag chatapp_magiconion:latest cysharp/magiconion_sample_chatapp_telemetry:latest
-docker tag chatapp_magiconion:latest cysharp/magiconion_sample_chatapp_telemetry:3.0.13
+docker tag chatapp_magiconion:latest cysharp/magiconion_sample_chatapp_telemetry:4.0.1-0.8.0.beta1
 docker push cysharp/magiconion_sample_chatapp_telemetry:latest
-docker push cysharp/magiconion_sample_chatapp_telemetry:3.0.13
+docker push cysharp/magiconion_sample_chatapp_telemetry:4.0.1-0.8.0.beta1
diff --git a/samples/ChatApp.Telemetry/docker_push.full.bat b/samples/ChatApp.Telemetry/docker_push.full.bat
@@ -0,0 +1,6 @@
+:: cysharp/magiconion_sample_chatapp_telemetry
+docker build -t chatapp_magiconion:latest -f samples/ChatApp.Telemetry/ChatApp.Server/Dockerfile.full .
+docker tag chatapp_magiconion:latest cysharp/magiconion_sample_chatapp_telemetry:latest
+docker tag chatapp_magiconion:latest cysharp/magiconion_sample_chatapp_telemetry:4.0.1-0.8.0.beta1
+docker push cysharp/magiconion_sample_chatapp_telemetry:latest
+docker push cysharp/magiconion_sample_chatapp_telemetry:4.0.1-0.8.0.beta1
diff --git a/samples/ChatApp.Telemetry/k8s/app/deployment.yaml b/samples/ChatApp.Telemetry/k8s/app/deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: chatapp
-          image: cysharp/magiconion_sample_chatapp_telemetry:3.0.13
+          image: cysharp/magiconion_sample_chatapp_telemetry:4.0.1-0.8.0.beta1
           ports:
             - containerPort: 12345
               name: magiconion

diff --git a/samples/ChatApp/ChatApp.Server/appsettings.Development.json b/samples/ChatApp/ChatApp.Server/appsettings.Development.json
@@ -2,13 +2,6 @@
   "MagicOnion": {
     "Service": {
       "IsReturnExceptionStackTraceInErrorDetail": true
-    },
-    "ServerPorts": [
-      {
-        "Host": "localhost",
-        "Port": 12345,
-        "UseInsecureConnection": true
-      }
-    ]
+    }
   }
 }
diff --git a/samples/ChatApp/ChatApp.Server/appsettings.json b/samples/ChatApp/ChatApp.Server/appsettings.json
@@ -1,18 +1,19 @@
 {
-  "MagicOnion": {
-    "ServerPorts": [
-      {
-        "Host": "0.0.0.0",
-        "Port": 12345,
-        "UseInsecureConnection": false,
-        "ServerCredentials": [
-          {
-            "CertificatePath": "./server.crt",
-            "KeyPath": "./server.key"
-          }
-        ]
+  "Kestrel": {
+    "Endpoints": {
+      "Grpc": {
+        "Url": "http://localhost:5000",
+        "Protocols": "Http2"
+      },
+      "Https": {
+        "Url": "https://localhost:5001",
+        "Protocols": "Http1AndHttp2"
+      },
+      "Http": {
+        "Url": "http://localhost:5002",
+        "Protocols": "Http1"
       }
-    ]
+    }
   },
   "Logging": {
     "LogLevel": {