Skip to content

Commit 4385c2c

Browse files
renovate-sh-app[bot]martincostello
renovate-sh-app[bot]
and
martincostello
authored
chore(deps): update davidanson/markdownlint-cli2-action action to v21 (#346)
* chore(deps): update davidanson/markdownlint-cli2-action action to v21 | datasource | package | from | to | | ----------- | ----------------------------------- | ------- | ------- | | github-tags | DavidAnson/markdownlint-cli2-action | v20.0.0 | v21.0.0 | Signed-off-by: renovate-sh-app[bot] <219655108+renovate-sh-app[bot]@users.noreply.github.com> * Fix lint warning Fix new lint warnings. --------- Signed-off-by: renovate-sh-app[bot] <219655108+renovate-sh-app[bot]@users.noreply.github.com> Co-authored-by: renovate-sh-app[bot] <219655108+renovate-sh-app[bot]@users.noreply.github.com> Co-authored-by: martincostello <[email protected]>
1 parent 81ad84b commit 4385c2c

File tree

4 files changed

+66
-63
lines changed

4 files changed

+66
-63
lines changed

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
args: -color
3737

3838
- name: Lint markdown
39-
uses: DavidAnson/markdownlint-cli2-action@992badcdf24e3b8eb7e87ff9287fe931bcb00c6e # v20.0.0
39+
uses: DavidAnson/markdownlint-cli2-action@30a0e04f1870d58f8d717450cc6134995f993c63 # v21.0.0
4040
with:
4141
config: '.markdownlint.yaml'
4242
globs: |

‎docs/configuration.md‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
11
# Configuring the Grafana OpenTelemetry distribution for .NET
22

3-
* [Configuring metrics](#configuring-metrics)
4-
* [Configuring logs](#configuring-logs)
5-
* [Configuring traces](#configuring-traces)
6-
* [ASP.NET Core](#aspnet-core)
7-
* [Exporter configuration](#exporter-configuration)
8-
* [Sending to an agent or collector via OTLP](#sending-to-an-agent-or-collector-via-otlp)
9-
* [Sending data directly to Grafana Cloud via OTLP](#sending-data-directly-to-grafana-cloud-via-otlp)
10-
* [Instrumentation configuration](#instrumentation-configuration)
11-
* [Disabling instrumentations](#disabling-instrumentations)
12-
* [Adding instrumentations not supported by the distribution](#adding-instrumentations-not-supported-by-the-distribution)
13-
* [Extra steps to activate specific instrumentations](#extra-steps-to-activate-specific-instrumentations)
14-
* [ASP.NET (`AspNet`)](#aspnet-aspnet)
15-
* [OWIN (`Owin`)](#owin-owin)
16-
* [Resource detector configuration](#resource-detector-configuration)
17-
* [Specifying resource detectors](#specifying-resource-detectors)
18-
* [Disabling resource detectors](#disabling-resource-detectors)
19-
* [Custom configuration](#custom-configuration)
20-
* [Supported environment variables](#supported-environment-variables)
3+
- [Configuring the Grafana OpenTelemetry distribution for .NET](#configuring-the-grafana-opentelemetry-distribution-for-net)
4+
- [Configuring metrics](#configuring-metrics)
5+
- [Configuring logs](#configuring-logs)
6+
- [Configuring traces](#configuring-traces)
7+
- [ASP.NET Core](#aspnet-core)
8+
- [Exporter configuration](#exporter-configuration)
9+
- [Sending to an agent or collector via OTLP](#sending-to-an-agent-or-collector-via-otlp)
10+
- [Sending data directly to Grafana Cloud via OTLP](#sending-data-directly-to-grafana-cloud-via-otlp)
11+
- [Instrumentation configuration](#instrumentation-configuration)
12+
- [Disabling instrumentations](#disabling-instrumentations)
13+
- [Adding instrumentations not supported by the distribution](#adding-instrumentations-not-supported-by-the-distribution)
14+
- [Resource detector configuration](#resource-detector-configuration)
15+
- [Specifying resource detectors](#specifying-resource-detectors)
16+
- [Disabling resource detectors](#disabling-resource-detectors)
17+
- [Adding resource detectors not supported by the distribution](#adding-resource-detectors-not-supported-by-the-distribution)
18+
- [Extra steps to activate specific instrumentations](#extra-steps-to-activate-specific-instrumentations)
19+
- [ASP.NET (`AspNet`)](#aspnet-aspnet)
20+
- [OWIN (`Owin`)](#owin-owin)
21+
- [Customizing resource attributes](#customizing-resource-attributes)
22+
- [Custom configuration](#custom-configuration)
23+
- [Supported environment variables](#supported-environment-variables)
2124

2225
## Configuring metrics
2326

@@ -379,7 +382,7 @@ are not contained in the distribution.
379382

380383
## Supported environment variables
381384

382-
| Variable | Example value | Description |
383-
| ----------------------------------------- | ------------------ | ----------- |
384-
| `GRAFANA_DOTNET_DISABLE_INSTRUMENTATIONS` | "Process,NetRuntime" | A comma-separated list of instrumentations to disable. |
385-
| `GRAFANA_DOTNET_DISABLE_RESOURCE_DETECTORS`| "Host" | A comma-separated list of resource detectors to disable. |
385+
| Variable | Example value | Description |
386+
| ------------------------------------------ | -------------------- | -------------------------------------------------------- |
387+
| `GRAFANA_DOTNET_DISABLE_INSTRUMENTATIONS` | "Process,NetRuntime" | A comma-separated list of instrumentations to disable. |
388+
| `GRAFANA_DOTNET_DISABLE_RESOURCE_DETECTORS`| "Host" | A comma-separated list of resource detectors to disable. |

‎docs/supported-instrumentations.md‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,33 @@ At the moment, the following instrumentations are included in the distribution
44
packages with [full](./installation.md#install-the-full-package-with-all-available-instrumentations)
55
and [minimal](./installation.md#install-the-base-package) dependencies:
66

7-
| Identifier | Full | Base | Library name |
8-
| --------------------- | ------------------ | ------------------ | ------------ |
9-
| `AspNet` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.AspNet](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.AspNet) |
10-
| `AspNetCore` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.AspNetCore](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.AspNetCore) |
11-
| `AWS` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.AWS](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.AWS) |
12-
| `AWSLambda` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.AWSLambda](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.AWSLambda) |
13-
| `AWSResource` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Resources.AWS](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Resources.AWS) |
14-
| `AzureResource` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Resources.Azure](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Resources.Azure) |
15-
| `Cassandra` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.Cassandra](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Cassandra) |
16-
| `ContainerResource` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Resources.Container](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Resources.Container) |
17-
| `ElasticsearchClient` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.ElasticsearchClient](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.ElasticsearchClient) |
18-
| `EntityFrameworkCore` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.EntityFrameworkCore](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.EntityFrameworkCore) |
19-
| `GrpcNetClient` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Instrumentation.GrpcNetClient](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.GrpcNetClient) |
20-
| `Hangfire` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.Hangfire](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Hangfire) |
21-
| `HttpClient` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Instrumentation.Http](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Http) |
22-
| `HostResource` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Resources.Host](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Resources.Host) |
23-
| `MySqlData` | | | [MySql.Data.OpenTelemetry](https://www.nuget.org/packages/MySql.Data.OpenTelemetry) |
24-
| | | | [OpenTelemetry.Instrumentation.MySqlData](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.MySqlData) :warning: **Deprecated** |
25-
| `NetRuntime` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Instrumentation.Runtime](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Runtime) |
26-
| `Owin` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.Owin](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Owin) |
27-
| `Process` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Instrumentation.Process](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Process) |
28-
| `ProcessResource` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Resources.Process](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Resources.Process) |
7+
| Identifier | Full | Base | Library name |
8+
| ----------------------- | ------------------ | ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------- |
9+
| `AspNet` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.AspNet](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.AspNet) |
10+
| `AspNetCore` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.AspNetCore](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.AspNetCore) |
11+
| `AWS` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.AWS](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.AWS) |
12+
| `AWSLambda` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.AWSLambda](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.AWSLambda) |
13+
| `AWSResource` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Resources.AWS](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Resources.AWS) |
14+
| `AzureResource` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Resources.Azure](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Resources.Azure) |
15+
| `Cassandra` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.Cassandra](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Cassandra) |
16+
| `ContainerResource` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Resources.Container](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Resources.Container) |
17+
| `ElasticsearchClient` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.ElasticsearchClient](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.ElasticsearchClient) |
18+
| `EntityFrameworkCore` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.EntityFrameworkCore](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.EntityFrameworkCore) |
19+
| `GrpcNetClient` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Instrumentation.GrpcNetClient](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.GrpcNetClient) |
20+
| `Hangfire` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.Hangfire](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Hangfire) |
21+
| `HttpClient` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Instrumentation.Http](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Http) |
22+
| `HostResource` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Resources.Host](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Resources.Host) |
23+
| `MySqlData` | | | [MySql.Data.OpenTelemetry](https://www.nuget.org/packages/MySql.Data.OpenTelemetry) |
24+
| | | | [OpenTelemetry.Instrumentation.MySqlData](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.MySqlData) :warning: **Deprecated** |
25+
| `NetRuntime` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Instrumentation.Runtime](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Runtime) |
26+
| `Owin` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.Owin](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Owin) |
27+
| `Process` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Instrumentation.Process](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Process) |
28+
| `ProcessResource` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Resources.Process](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Resources.Process) |
2929
| `ProcessRuntimeResource`| :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Resources.ProcessRuntime](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Resources.ProcessRuntime) |
30-
| `Quartz` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.Quartz](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Quartz) |
31-
| `SqlClient` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Instrumentation.SqlClient](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.SqlClient) |
32-
| `StackExchangeRedis` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.StackExchangeRedis](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.StackExchangeRedis) |
33-
| `Wcf` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.Wcf](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Wcf) |
30+
| `Quartz` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.Quartz](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Quartz) |
31+
| `SqlClient` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Instrumentation.SqlClient](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.SqlClient) |
32+
| `StackExchangeRedis` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.StackExchangeRedis](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.StackExchangeRedis) |
33+
| `Wcf` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.Wcf](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Wcf) |
3434

3535
* The `AWSLambda` instrumentation is included but needs to be explicitly
3636
activated, as activating it in non-AWS scenarios causes errors.

0 commit comments

Comments
 (0)