Browse Source
Add debug and tracing annotations for dapr (#298)
* add debug and tracing annotations
davidfowl/aspnet-urls
Thang Chung
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
17 additions and
1 deletions
-
src/Microsoft.Tye.Extensions/Dapr/DaprExtension.cs
-
test/E2ETest/testassets/generate/dapr.yaml
-
test/E2ETest/testassets/projects/dapr/tye.yaml
|
|
|
@ -49,7 +49,7 @@ namespace Microsoft.Tye.Extensions.Dapr |
|
|
|
|
|
|
|
// These environment variables are replaced with environment variables
|
|
|
|
// defined for this service.
|
|
|
|
Args = $"-app-id {project.Name} -app-port %APP_PORT% -dapr-grpc-port %DAPR_GRPC_PORT% --dapr-http-port %DAPR_HTTP_PORT% --metrics-port %METRICS_PORT% --placement-address localhost:50005", |
|
|
|
Args = $"-app-id {project.Name} -app-port %APP_PORT% -dapr-grpc-port %DAPR_GRPC_PORT% --dapr-http-port %DAPR_HTTP_PORT% --metrics-port %METRICS_PORT% -log-level %LOG_LEVEL% -config %CONFIG% --placement-address localhost:50005", |
|
|
|
}; |
|
|
|
context.Application.Services.Add(proxy); |
|
|
|
|
|
|
|
@ -146,6 +146,16 @@ namespace Microsoft.Tye.Extensions.Dapr |
|
|
|
deployment.Annotations.Add("dapr.io/enabled", "true"); |
|
|
|
deployment.Annotations.Add("dapr.io/id", project.Name); |
|
|
|
deployment.Annotations.Add("dapr.io/port", (httpBinding.Port ?? 80).ToString(CultureInfo.InvariantCulture)); |
|
|
|
|
|
|
|
if (config.Data.TryGetValue("config", out var daprConfig) && daprConfig is object) |
|
|
|
{ |
|
|
|
deployment.Annotations.TryAdd("dapr.io/config", daprConfig!.ToString() ?? string.Empty); |
|
|
|
} |
|
|
|
|
|
|
|
if (config.Data.TryGetValue("log-level", out var logLevel) && logLevel is object) |
|
|
|
{ |
|
|
|
deployment.Annotations.TryAdd("dapr.io/log-level", logLevel!.ToString() ?? string.Empty); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -6,6 +6,8 @@ metadata: |
|
|
|
dapr.io/enabled: 'true' |
|
|
|
dapr.io/id: 'dapr_test_project' |
|
|
|
dapr.io/port: '80' |
|
|
|
dapr.io/config: 'tracing' |
|
|
|
dapr.io/log-level: 'debug' |
|
|
|
labels: |
|
|
|
app.kubernetes.io/name: 'dapr_test_project' |
|
|
|
app.kubernetes.io/part-of: 'dapr_test_application' |
|
|
|
@ -20,6 +22,8 @@ spec: |
|
|
|
dapr.io/enabled: 'true' |
|
|
|
dapr.io/id: 'dapr_test_project' |
|
|
|
dapr.io/port: '80' |
|
|
|
dapr.io/config: 'tracing' |
|
|
|
dapr.io/log-level: 'debug' |
|
|
|
labels: |
|
|
|
app.kubernetes.io/name: 'dapr_test_project' |
|
|
|
app.kubernetes.io/part-of: 'dapr_test_application' |
|
|
|
|
|
|
|
@ -1,6 +1,8 @@ |
|
|
|
name: dapr_test_application |
|
|
|
extensions: |
|
|
|
- name: dapr |
|
|
|
config: tracing |
|
|
|
log-level: debug |
|
|
|
services: |
|
|
|
- name: dapr_test_project |
|
|
|
project: dapr.csproj |