Skip to content

Commit

Permalink
Merge pull request #36707 from dotnet/main
Browse files Browse the repository at this point in the history
  • Loading branch information
BillWagner authored Aug 16, 2023
2 parents a262a91 + a99d1ad commit 3a34a4b
Show file tree
Hide file tree
Showing 12 changed files with 2,630 additions and 2,613 deletions.
9 changes: 4 additions & 5 deletions .github/ISSUE_TEMPLATE/new-feature-csharp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,10 @@ body:
label: Visual Studio release
description: What Visual Studio (preview) contains this feature?
options:
- "17.6"
- 17.7p1
- 17.7p2
- 17.7p3
- 17.7p4s
- "17.7"
- "17.8p1"
- "17.8p2"
- "17.8p3"
- Other (please put exact version in description textbox)
validations:
required: true
Expand Down
28 changes: 14 additions & 14 deletions docfx.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,7 @@
"csharp-9.0/*.md",
"csharp-10.0/*.md",
"csharp-11.0/*.md",
"primary-constructors.md",
"using-alias-types.md",
"lambda-method-group-defaults.md",
"inline-arrays.md"
"csharp-12.0/*.md"
],
"src": "_csharplang/proposals",
"dest": "csharp/language-reference/proposals",
Expand All @@ -70,7 +67,9 @@
"csharp-8.0/obsolete-accessor.md",
"csharp-8.0/shadowing-in-nested-functions.md",
"csharp-8.0/unconstrained-null-coalescing.md",
"csharp-8.0/nullable-reference-types-specification.md"
"csharp-8.0/nullable-reference-types-specification.md",
"csharp-12.0/collection-expressions.md",
"csharp-12.0/ref-readonly-parameters.md"
]
},
{
Expand Down Expand Up @@ -464,7 +463,7 @@
"_csharplang/proposals/csharp-9.0/*.md": "07/29/2020",
"_csharplang/proposals/csharp-10.0/*.md": "08/07/2021",
"_csharplang/proposals/csharp-11.0/*.md": "09/30/2022",
"_csharplang/proposals/*.md": "07/06/2023",
"_csharplang/proposals/csharp-12.0/*.md": "08/15/2023",
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 7.md": "11/08/2022",
"_vblang/spec/*.md": "07/21/2017"
},
Expand Down Expand Up @@ -663,10 +662,10 @@
"_csharplang/proposals/csharp-11.0/unsigned-right-shift-operator.md": "Unsigned right shift operator",
"_csharplang/proposals/csharp-11.0/utf8-string-literals.md": "UTF-8 string literals",

"_csharplang/proposals/primary-constructors.md": "Primary constructors",
"_csharplang/proposals/using-alias-types.md": "Alias any type",
"_csharplang/proposals/lambda-method-group-defaults.md": "Optional and parameter array parameters for lambdas and method groups",
"_csharplang/proposals/inline-arrays.md": "Inline arrays, or fixed sized buffers",
"_csharplang/proposals/csharp-12.0/primary-constructors.md": "Primary constructors",
"_csharplang/proposals/csharp-12.0/using-alias-types.md": "Alias any type",
"_csharplang/proposals/csharp-12.0/lambda-method-group-defaults.md": "Optional and parameter array parameters for lambdas and method groups",
"_csharplang/proposals/csharp-12.0/inline-arrays.md": "Inline arrays, or fixed sized buffers",


"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 7.md": "C# compiler breaking changes since C# 10",
Expand Down Expand Up @@ -775,10 +774,10 @@
"_csharplang/proposals/csharp-11.0/unsigned-right-shift-operator.md": "This feature defines a logical right-shift operator, `>>>`. The logical right shift operator always shifts in 0 values in the left-most bits during a shift.",
"_csharplang/proposals/csharp-11.0/utf8-string-literals.md": "This feature enables the `u8` suffix on a string literal. The `u8` suffix instructs the compiler to convert the UTF-8 string literal to a `ReadOnlySpan<byte>`.",

"_csharplang/proposals/primary-constructors.md": "Primary constructors put the parameters of one constructor in scope for the whole class or struct to be used for initialization or directly as object state. The trade-off is that any other constructors must call through the primary constructor.",
"_csharplang/proposals/using-alias-types.md": "Using directives can alias any type, not just named types. You can create aliases for tuple types, generics and more.",
"_csharplang/proposals/lambda-method-group-defaults.md": "Optional and parameter array parameters for lambdas and method groups",
"_csharplang/proposals/inline-arrays.md": "Inline arrays provide a general-purpose and safe mechanism for declaring inline arrays within C# classes, structs, and interfaces.",
"_csharplang/proposals/csharp-12.0/primary-constructors.md": "Primary constructors put the parameters of one constructor in scope for the whole class or struct to be used for initialization or directly as object state. The trade-off is that any other constructors must call through the primary constructor.",
"_csharplang/proposals/csharp-12.0/using-alias-types.md": "Using directives can alias any type, not just named types. You can create aliases for tuple types, generics and more.",
"_csharplang/proposals/csharp-12.0/lambda-method-group-defaults.md": "Optional and parameter array parameters for lambdas and method groups",
"_csharplang/proposals/csharp-12.0/inline-arrays.md": "Inline arrays provide a general-purpose and safe mechanism for declaring inline arrays within C# classes, structs, and interfaces.",

"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 7.md": "Learn about any breaking changes since the initial release of C# 10",
"_vblang/spec/introduction.md": "This chapter provides and introduction to the Visual Basic language.",
Expand All @@ -801,6 +800,7 @@
"_csharplang/proposals/csharp-9.0/*.md": "C# 9.0 draft feature specifications",
"_csharplang/proposals/csharp-10.0/*.md": "C# 10.0 draft feature specifications",
"_csharplang/proposals/csharp-11.0/*.md": "C# 11.0 draft feature specifications",
"_csharplang/proposals/csharp-12.0/*.md": "C# 12.0 draft feature specifications",
"_csharplang/proposals/*.md": "C# preview feature specifications",
"docs/framework/**/**.md": ".NET Framework",
"docs/framework/data/adonet/**/**.md": "ADO.NET",
Expand Down
10 changes: 5 additions & 5 deletions docs/architecture/dapr-for-net-developers/observability.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ As Dapr abstracts away the plumbing, the application is unaware of how observabi

Dapr's [sidecar architecture](dapr-at-20000-feet.md#sidecar-architecture) enables built-in observability features. As services communicate, Dapr sidecars intercept the traffic and extract tracing, metrics, and logging information. Telemetry is published in an open standards format. By default, Dapr supports [OpenTelemetry](https://opentelemetry.io/) and [Zipkin](https://zipkin.io/).

Dapr provides [collectors](https://docs.dapr.io/operations/monitoring/tracing/otel-collector/) that can publish telemetry to different back-end monitoring tools. These tools present Dapr telemetry for analysis and querying. Figure 10-1 shows the Dapr observability architecture:
Dapr provides [collectors](https://docs.dapr.io/operations/observability/tracing/otel-collector/) that can publish telemetry to different back-end monitoring tools. These tools present Dapr telemetry for analysis and querying. Figure 10-1 shows the Dapr observability architecture:

:::image type="content" source="./media/observability/observability-architecture.png" alt-text="Dapr observability architecture":::

Expand Down Expand Up @@ -294,7 +294,7 @@ Dapr generates a large set of metrics for Dapr system services and its runtime.
| dapr_http_server_request_count | Runtime | Number of HTTP requests started in an HTTP server. |
| dapr_http/client/sent_bytes | Runtime | Total bytes sent in request body (not including headers) by an HTTP client. |

For more information on available metrics, see the [Dapr metrics documentation](https://docs.dapr.io/operations/monitoring/metrics/).
For more information on available metrics, see the [Dapr metrics documentation](https://docs.dapr.io/operations/observability/metrics/).

#### Configure Dapr metrics

Expand Down Expand Up @@ -323,7 +323,7 @@ With the Prometheus scraper collecting and publishing metrics into the monitorin

**Figure 10-9.** Grafana dashboard.

The Dapr documentation includes a [tutorial for installing Prometheus and Grafana](https://docs.dapr.io/operations/monitoring/metrics/grafana/).
The Dapr documentation includes a [tutorial for installing Prometheus and Grafana](https://docs.dapr.io/operations/observability/metrics/grafana/).

### Logging

Expand Down Expand Up @@ -392,7 +392,7 @@ helm install dapr dapr/dapr --namespace dapr-system --set global.logAsJson=true

#### Collect logs

The logs emitted by Dapr can be fed into a monitoring back end for analysis. A log collector is a component that collects logs from a system and sends them to a monitoring back end. A popular log collector is [Fluentd](https://www.fluentd.org/). Check out the [How-To: Set up Fluentd, Elastic search and Kibana in Kubernetes](https://docs.dapr.io/operations/monitoring/logging/fluentd/) in the Dapr documentation. This article contains instructions for setting up Fluentd as log collector and the [ELK Stack](https://www.elastic.co/elastic-stack) (Elastic Search and Kibana) as a monitoring back end.
The logs emitted by Dapr can be fed into a monitoring back end for analysis. A log collector is a component that collects logs from a system and sends them to a monitoring back end. A popular log collector is [Fluentd](https://www.fluentd.org/). Check out the [How-To: Set up Fluentd, Elastic search and Kibana in Kubernetes](https://docs.dapr.io/operations/observability/logging/fluentd/) in the Dapr documentation. This article contains instructions for setting up Fluentd as log collector and the [ELK Stack](https://www.elastic.co/elastic-stack) (Elastic Search and Kibana) as a monitoring back end.

### Health status

Expand Down Expand Up @@ -515,7 +515,7 @@ Dapr provides different types of telemetry, including distributed tracing, loggi

Dapr only produces telemetry for the Dapr system services and sidecars. Telemetry from your application code isn't automatically included. You can however use a specific SDK like the OpenTelemetry SDK for .NET to emit telemetry from your application code.

Dapr telemetry is produced in an open-standards based format so that it can be ingested by a large set of available monitoring tools. Examples include Zipkin, Azure Application Insights, the ELK Stack, New Relic, and Grafana. See [Monitor your application with Dapr](https://docs.dapr.io/operations/monitoring/) in the Dapr documentation for tutorials on how to monitor your Dapr applications with specific monitoring back ends.
Dapr telemetry is produced in an open-standards based format so that it can be ingested by a large set of available monitoring tools. Examples include Zipkin, Azure Application Insights, the ELK Stack, New Relic, and Grafana. See [Monitor your application with Dapr](https://docs.dapr.io/operations/observability/) in the Dapr documentation for tutorials on how to monitor your Dapr applications with specific monitoring back ends.

You'll need a telemetry scraper that ingests telemetry and publishes it to the monitoring back end.

Expand Down
Loading

0 comments on commit 3a34a4b

Please sign in to comment.