Skip to content

Commit c756eb4

Browse files
KielekKielek
authored
Release 1.4.0 (#3265)
* Fix redis instrumentation version * Release 1.4.0 * Add statement about SetDbStatement Not supported on .NET Framework for System.Data.SqlClient.
1 parent 2818bfb commit c756eb4

File tree

7 files changed

+30
-16
lines changed

7 files changed

+30
-16
lines changed

‎CHANGELOG.md

+15-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,21 @@ All notable changes to this component are documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66
This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8-
## [Unreleased](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/compare/v1.3.0..HEAD)
8+
## [Unreleased](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/compare/v1.4.0..HEAD)
9+
10+
### Added
11+
12+
### Changed
13+
14+
#### Dependency updates
15+
16+
### Deprecated
17+
18+
### Removed
19+
20+
### Fixed
21+
22+
## [1.4.0](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.4.0)
923

1024
### Added
1125

@@ -39,8 +53,6 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h
3953
- .NET Framework only, following packages updated
4054
- `OpenTelemetry.Instrumentation.AspNet` from `1.7.0-beta.1` to `1.7.0-beta.2`.
4155

42-
### Deprecated
43-
4456
### Removed
4557

4658
- Container resource detector will be not executed on .NET Framework.

‎docs/README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ to .NET applications without having to modify their source code.
1212
> [!WARNING]
1313
> The following documentation refers to the in-development version
1414
of OpenTelemetry .NET Automatic Instrumentation. Docs for the latest version
15-
([1.3.0](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/latest))
15+
([1.4.0](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/latest))
1616
can be found in [opentelemetry.io](https://github.com/open-telemetry/opentelemetry.io/tree/main/content/en/docs/languages/net/automatic)
17-
or [here](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v1.3.0/docs/README.md).
17+
or [here](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v1.4.0/docs/README.md).
1818

1919
---
2020

@@ -164,7 +164,7 @@ Example usage:
164164

165165
```sh
166166
# Download the bash script
167-
curl -sSfL https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/download/v1.3.0/otel-dotnet-auto-install.sh -O
167+
curl -sSfL https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/download/v1.4.0/otel-dotnet-auto-install.sh -O
168168

169169
# Install core files
170170
sh ./otel-dotnet-auto-install.sh
@@ -187,7 +187,7 @@ uses environment variables as parameters:
187187
| `OTEL_DOTNET_AUTO_HOME` | Location where binaries are to be installed | No | `$HOME/.otel-dotnet-auto` |
188188
| `OS_TYPE` | Possible values: `linux-glibc`, `linux-musl`, `macos`, `windows` | No | *Calculated* |
189189
| `TMPDIR` | Temporary directory used when downloading the files | No | `$(mktemp -d)` |
190-
| `VERSION` | Version to download | No | `1.3.0` |
190+
| `VERSION` | Version to download | No | `1.4.0` |
191191

192192
[instrument.sh](../instrument.sh) script
193193
uses environment variables as parameters:
@@ -206,7 +206,7 @@ Example usage (run as administrator):
206206

207207
```powershell
208208
# Download the module
209-
$module_url = "https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/download/v1.3.0/OpenTelemetry.DotNet.Auto.psm1"
209+
$module_url = "https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/download/v1.4.0/OpenTelemetry.DotNet.Auto.psm1"
210210
$download_path = Join-Path $env:temp "OpenTelemetry.DotNet.Auto.psm1"
211211
Invoke-WebRequest -Uri $module_url -OutFile $download_path -UseBasicParsing
212212

‎docs/config.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,11 @@ the `ASPNETCORE_HOSTINGSTARTUPASSEMBLIES` environment variable to
198198

199199
### Instrumentation options
200200

201-
| Environment variable | Description | Default value | Status |
202-
|-----------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------|-----------------------------------------------------------------------------------------------------------------------------------|
203-
| `OTEL_DOTNET_AUTO_ENTITYFRAMEWORKCORE_SET_DBSTATEMENT_FOR_TEXT` | Whether the Entity Framework Core instrumentation can pass SQL statements through the `db.statement` attribute. Queries might contain sensitive information. If set to `false`, `db.statement` is recorded only for executing stored procedures. | `false` | [Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/versioning-and-stability.md) |
204-
| `OTEL_DOTNET_AUTO_GRAPHQL_SET_DOCUMENT` | Whether the GraphQL instrumentation can pass raw queries through the `graphql.document` attribute. Queries might contain sensitive information. | `false` | [Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/versioning-and-stability.md) |
205-
| `OTEL_DOTNET_AUTO_SQLCLIENT_SET_DBSTATEMENT_FOR_TEXT` | Whether the SQL Client instrumentation can pass SQL statements through the `db.statement` attribute. Queries might contain sensitive information. If set to `false`, `db.statement` is recorded only for executing stored procedures. | `false` | [Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/versioning-and-stability.md) |
201+
| Environment variable | Description | Default value | Status |
202+
|-----------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------|-----------------------------------------------------------------------------------------------------------------------------------|
203+
| `OTEL_DOTNET_AUTO_ENTITYFRAMEWORKCORE_SET_DBSTATEMENT_FOR_TEXT` | Whether the Entity Framework Core instrumentation can pass SQL statements through the `db.statement` attribute. Queries might contain sensitive information. If set to `false`, `db.statement` is recorded only for executing stored procedures. | `false` | [Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/versioning-and-stability.md) |
204+
| `OTEL_DOTNET_AUTO_GRAPHQL_SET_DOCUMENT` | Whether the GraphQL instrumentation can pass raw queries through the `graphql.document` attribute. Queries might contain sensitive information. | `false` | [Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/versioning-and-stability.md) |
205+
| `OTEL_DOTNET_AUTO_SQLCLIENT_SET_DBSTATEMENT_FOR_TEXT` | Whether the SQL Client instrumentation can pass SQL statements through the `db.statement` attribute. Queries might contain sensitive information. If set to `false`, `db.statement` is recorded only for executing stored procedures. **Not supported on .NET Framework for System.Data.SqlClient.** | `false` | [Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/versioning-and-stability.md) |
206206

207207
## Propagators
208208

‎docs/troubleshooting.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ When adding the NuGet packages to your project you get an error message similar
6262
to:
6363

6464
```txt
65-
Could not install package 'OpenTelemetry.AutoInstrumentation.Runtime.Native 1.3.0'. You are trying to install this package into a project that targets '.NETFramework,Version=v4.7.2', but the package does not contain any assembly references or content files that are compatible with that framework. For more information, contact the package author.
65+
Could not install package 'OpenTelemetry.AutoInstrumentation.Runtime.Native 1.4.0'. You are trying to install this package into a project that targets '.NETFramework,Version=v4.7.2', but the package does not contain any assembly references or content files that are compatible with that framework. For more information, contact the package author.
6666
```
6767

6868
#### Solution

‎docs/using-the-nuget-packages.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ you to either add the missing instrumentation package or to skip the
4040
instrumentation of the corresponding package:
4141

4242
```terminal
43-
~packages/opentelemetry.autoinstrumentation.buildtasks/1.3.0/build/OpenTelemetry.AutoInstrumentation.BuildTasks.targets(29,5): error : OpenTelemetry.AutoInstrumentation: add a reference to the instrumentation package 'MongoDB.Driver.Core.Extensions.DiagnosticSources' version 1.3.0 or add 'MongoDB.Driver.Core' to the property 'SkippedInstrumentations' to suppress this error.
43+
~packages/opentelemetry.autoinstrumentation.buildtasks/1.4.0/build/OpenTelemetry.AutoInstrumentation.BuildTasks.targets(29,5): error : OpenTelemetry.AutoInstrumentation: add a reference to the instrumentation package 'MongoDB.Driver.Core.Extensions.DiagnosticSources' version 1.3.0 or add 'MongoDB.Driver.Core' to the property 'SkippedInstrumentations' to suppress this error.
4444
```
4545

4646
To resolve the error either add the recommended instrumentation package or skip

‎src/OpenTelemetry.AutoInstrumentation.BuildTasks/OpenTelemetry.AutoInstrumentation.BuildTasks.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
Condition="!$(SkippedInstrumentations.Contains('StackExchange.Redis')) AND !$(TargetFramework.StartsWith('net4'))"
1515
TargetNuGetPackageVersionRange="[2.1.58, 3.0.0)"
1616
InstrumentationNuGetPackageId="OpenTelemetry.Instrumentation.StackExchangeRedis"
17-
InstrumentationNuGetPackageVersion="1.0.0-rc9.12" />
17+
InstrumentationNuGetPackageVersion="1.0.0-rc9.13" />
1818

1919
</ItemGroup>
2020

‎test/IntegrationTests/SqlClientSystemTests.cs

+2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ public static IEnumerable<object[]> GetData()
2222
{
2323
foreach (var version in LibraryVersion.SqlClientSystem)
2424
{
25+
#if NET6_0_OR_GREATER
2526
yield return new[] { version[0], true };
27+
#endif
2628
yield return new[] { version[0], false };
2729
}
2830
}

0 commit comments

Comments
 (0)