Skip to content

Commit

Permalink
Update fork (#8)
Browse files Browse the repository at this point in the history 
* grpc-health-probe-0.3.5 (GoogleCloudPlatform#456)

* grpc-health-probe-0.3.4

* grpc-health-probe-0.3.4

* grpc-health-probe-0.3.4

* grpc-health-probe-0.3.4

* grpc-health-probe-0.3.4

* grpc-health-probe-0.3.4

* grpc-health-probe-0.3.4

* grpc-health-probe-0.3.4

* GRPC_HEALTH_PROBE_VERSION=v0.3.5

* cartservice - managed grpc (GoogleCloudPlatform#454)

* managed grpc

* PublishSingleFile + PublishTrimmed

* ASPNETCORE_URLS

* AddHealthChecks

* Implement healthcheck

* /bin/grpc_health_probe

* -addr=localhost:7070

* unit tests

* GRPC_HEALTH_PROBE_VERSION=v0.3.5

* review unit test csproj

Co-authored-by: Mathieu Benoit <mathieu-benoit@hotmail.fr>
  • Loading branch information
@alanwest @mathieu-benoit
alanwest and mathieu-benoit authored Dec 9, 2020
1 parent f8634ed commit 5867c16
Show file tree
Hide file tree
Showing 27 changed files with 241 additions and 6,554 deletions.
6 changes: 2 additions & 4 deletions kubernetes-manifests/cartservice.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,8 @@ spec:
env:
- name: REDIS_ADDR
value: "redis-cart:6379"
- name: PORT
value: "7070"
- name: LISTEN_ADDR
value: "0.0.0.0"
- name: ASPNETCORE_URLS
value: "http://0.0.0.0:7070"
resources:
requests:
cpu: 200m
Expand Down
6 changes: 2 additions & 4 deletions release/kubernetes-manifests.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -427,10 +427,8 @@ spec:
env:
- name: REDIS_ADDR
value: "redis-cart:6379"
- name: PORT
value: "7070"
- name: LISTEN_ADDR
value: "0.0.0.0"
- name: ASPNETCORE_URLS
value: "http://0.0.0.0:7070"
resources:
requests:
cpu: 200m
Expand Down
2 changes: 1 addition & 1 deletion src/adservice/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ RUN mkdir -p /opt/cprof && \
| tar xzv -C /opt/cprof && \
rm -rf profiler_java_agent.tar.gz

RUN GRPC_HEALTH_PROBE_VERSION=v0.3.1 && \
RUN GRPC_HEALTH_PROBE_VERSION=v0.3.5 && \
wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \
chmod +x /bin/grpc_health_probe

Expand Down
60 changes: 0 additions & 60 deletions src/cartservice/CartServiceImpl.cs
View file

This file was deleted.

26 changes: 5 additions & 21 deletions src/cartservice/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,31 +12,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM mcr.microsoft.com/dotnet/sdk:5.0 as builder
FROM mcr.microsoft.com/dotnet/sdk:5.0.100 as builder
WORKDIR /app
COPY . .
RUN dotnet publish -r linux-musl-x64 --self-contained true -c release -o /cartservice
RUN dotnet publish -p:PublishSingleFile=true -r linux-musl-x64 --self-contained true -p:PublishTrimmed=True -p:TrimMode=Link -c release -o /cartservice

# cartservice
FROM alpine:3.12

RUN GRPC_HEALTH_PROBE_VERSION=v0.3.4 && \
FROM mcr.microsoft.com/dotnet/runtime-deps:5.0.0-alpine3.12-amd64
RUN GRPC_HEALTH_PROBE_VERSION=v0.3.5 && \
wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \
chmod +x /bin/grpc_health_probe

# Dependencies for runtime
# busybox-extras => telnet
RUN apk add --no-cache \
busybox-extras \
libc6-compat \
libunwind \
libuuid \
libgcc \
libstdc++ \
libssl1.1 \
libintl \
icu \
gcompat
WORKDIR /app
COPY --from=builder /cartservice .

Expand All @@ -47,4 +31,4 @@ ENV NEW_RELIC_API_KEY=${NEW_RELIC_API_KEY}
ENV NEW_RELIC_TRACE_URL=${NEW_RELIC_TRACE_URL}
ENV NEW_RELIC_METRIC_URL=${NEW_RELIC_METRIC_URL}

ENTRYPOINT ["./cartservice", "start"]
ENTRYPOINT ["/app/cartservice"]
196 changes: 14 additions & 182 deletions src/cartservice/Program.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2018 Google LLC
// Copyright 2020 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -12,194 +12,26 @@
// See the License for the specific language governing permissions and
// limitations under the License.

using System;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using cartservice.cartstore;
using cartservice.interfaces;
using CommandLine;
using Grpc.Core;
using Microsoft.Extensions.Configuration;
using OpenTelemetry.Resources;
using OpenTelemetry.Trace;
using System;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Hosting;

namespace cartservice
{
class Program
public class Program
{
const string CART_SERVICE_ADDRESS = "LISTEN_ADDR";
const string REDIS_ADDRESS = "REDIS_ADDR";
const string CART_SERVICE_PORT = "PORT";

[Verb("start", HelpText = "Starts the server listening on provided port")]
class ServerOptions
public static void Main(string[] args)
{
[Option('h', "hostname", HelpText = "The ip on which the server is running. If not provided, LISTEN_ADDR environment variable value will be used. If not defined, localhost is used")]
public string Host { get; set; }

[Option('p', "port", HelpText = "The port on for running the server")]
public int Port { get; set; }

[Option('r', "redis", HelpText = "The ip of redis cache")]
public string Redis { get; set; }
CreateHostBuilder(args).Build().Run();
}

private static TracerProvider tracerProvider;

static object StartServer(string host, int port, ICartStore cartStore)
{
// Run the server in a separate thread and make the main thread busy waiting.
// The busy wait is because when we run in a container, we can't use techniques such as waiting on user input (Console.Readline())
Task serverTask = Task.Run(async () =>
{
try
{

await cartStore.InitializeAsync();

var redisCartStore = cartStore as RedisCartStore;

if (redisCartStore != null)
{
tracerProvider = OpenTelemetry.Sdk.CreateTracerProviderBuilder()
.AddRedisInstrumentation(redisCartStore.ConnectionMultiplexer)
.AddSource(CartServiceImpl.ActivitySourceName)
.SetResource(Resources.CreateServiceResource("CartService"))
.AddNewRelicExporter(options =>
{
options.ApiKey = Environment.GetEnvironmentVariable("NEW_RELIC_API_KEY");
options.EndpointUrl = new Uri(Environment.GetEnvironmentVariable("NEW_RELIC_TRACE_URL"));
})
.Build();
}


Console.WriteLine($"Trying to start a grpc server at {host}:{port}");
Server server = new Server
{
Services =
{
// Cart Service Endpoint
Hipstershop.CartService.BindService(new CartServiceImpl(cartStore)),

// Health Endpoint
Grpc.Health.V1.Health.BindService(new HealthImpl(cartStore))
},
Ports = { new ServerPort(host, port, ServerCredentials.Insecure) }
};

Console.WriteLine($"Cart server is listening at {host}:{port}");
server.Start();

Console.WriteLine("Initialization completed");

// Keep the server up and running
while(true)
{
Thread.Sleep(TimeSpan.FromMinutes(10));
}
}
catch (Exception ex)
// Additional configuration is required to successfully run gRPC on macOS.
// For instructions on how to configure Kestrel and gRPC clients on macOS, visit https://go.microsoft.com/fwlink/?linkid=2099682
public static IHostBuilder CreateHostBuilder(string[] args) =>
Host.CreateDefaultBuilder(args)
.ConfigureWebHostDefaults(webBuilder =>
{
Console.WriteLine(ex);
}
});

return Task.WaitAny(new[] { serverTask });
}

static void Main(string[] args)
{
if (args.Length == 0)
{
Console.WriteLine("Invalid number of arguments supplied");
Environment.Exit(-1);
}

switch (args[0])
{
case "start":
Parser.Default.ParseArguments<ServerOptions>(args).MapResult(
(ServerOptions options) =>
{
Console.WriteLine($"Started as process with id {System.Diagnostics.Process.GetCurrentProcess().Id}");

// Set hostname/ip address
string hostname = options.Host;
if (string.IsNullOrEmpty(hostname))
{
Console.WriteLine($"Reading host address from {CART_SERVICE_ADDRESS} environment variable");
hostname = Environment.GetEnvironmentVariable(CART_SERVICE_ADDRESS);
if (string.IsNullOrEmpty(hostname))
{
Console.WriteLine($"Environment variable {CART_SERVICE_ADDRESS} was not set. Setting the host to 0.0.0.0");
hostname = "0.0.0.0";
}
}

// Set the port
int port = options.Port;
if (options.Port <= 0)
{
Console.WriteLine($"Reading cart service port from {CART_SERVICE_PORT} environment variable");
string portStr = Environment.GetEnvironmentVariable(CART_SERVICE_PORT);
if (string.IsNullOrEmpty(portStr))
{
Console.WriteLine($"{CART_SERVICE_PORT} environment variable was not set. Setting the port to 8080");
port = 8080;
}
else
{
port = int.Parse(portStr);
}
}

// Set redis cache host (hostname+port)
ICartStore cartStore;
string redis = ReadRedisAddress(options.Redis);

// Redis was specified via command line or environment variable
if (!string.IsNullOrEmpty(redis))
{
// If you want to start cart store using local cache in process, you can replace the following line with this:
// cartStore = new LocalCartStore();
cartStore = new RedisCartStore(redis);

return StartServer(hostname, port, cartStore);
}
else
{
Console.WriteLine("Redis cache host(hostname+port) was not specified. Starting a cart service using local store");
Console.WriteLine("If you wanted to use Redis Cache as a backup store, you should provide its address via command line or REDIS_ADDRESS environment variable.");
cartStore = new LocalCartStore();
}

return StartServer(hostname, port, cartStore);
},
errs => 1);
break;
default:
Console.WriteLine("Invalid command");
break;
}
}

private static string ReadRedisAddress(string address)
{
if (!string.IsNullOrEmpty(address))
{
return address;
}

Console.WriteLine($"Reading redis cache address from environment variable {REDIS_ADDRESS}");
string redis = Environment.GetEnvironmentVariable(REDIS_ADDRESS);
if (!string.IsNullOrEmpty(redis))
{
return redis;
}

return null;
}
webBuilder.UseStartup<Startup>();
});
}
}
Loading

0 comments on commit 5867c16

Please sign in to comment.