Skip to content

Commit 56cdd4f

Browse files
authored
Release 1.3.0 (#3237)
* Release 1.3.0 * Fix ignoring condition in SqlClientMicrosoftTests for 3.1.* SQL package
1 parent fda9d9b commit 56cdd4f

File tree

9 files changed

+47
-42
lines changed

9 files changed

+47
-42
lines changed

CHANGELOG.md

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

1024
- [Core components](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/VERSIONING.md#core-components):
1125
[`1.7.0`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.7.0)
@@ -16,6 +30,8 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h
1630
- Support for Host, Process, and Process Runtime resource detectors.
1731
- Support for `OpenTelemetry.Instrumentation.AspNet.AspNetMetricsInstrumentationOptions`
1832
for plugins.
33+
- Support for [Confluent.Kafka](https://www.nuget.org/packages/Confluent.Kafka)
34+
traces instrumentation from 1.4.0 to 3.0.0 (excluding).
1935

2036
### Changed
2137

@@ -65,8 +81,6 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h
6581
- `OpenTelemetry.Instrumentation.AspNet` from `1.6.0-beta.2` to `1.7.0-beta.1`,
6682
- `System.Text.Json` from `8.0.0` to `8.0.1`.
6783

68-
### Deprecated
69-
7084
### Removed
7185

7286
Removed support for `Microsoft.Extensions.Logging`
@@ -88,7 +102,6 @@ for `ILOGGER` for versions older than `8.0.0`.
88102
- Added support for [System.Data.SqlClient](https://www.nuget.org/packages/System.Data.SqlClient/)
89103
(NuGet package) traces instrumentation from `4.8.5`.
90104
- Ability to update installation via PS module (`OpenTelemetry.DotNet.Auto.psm1`).
91-
- Added support for `KAFKA` traces instrumentation.
92105

93106
### Changed
94107

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.2.0](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/latest))
15+
([1.3.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.2.0/docs/README.md).
17+
or [here](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v1.3.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.2.0/otel-dotnet-auto-install.sh -O
167+
curl -sSfL https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/download/v1.3.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.2.0` |
190+
| `VERSION` | Version to download | No | `1.3.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.2.0/OpenTelemetry.DotNet.Auto.psm1"
209+
$module_url = "https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/download/v1.3.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/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.2.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.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.
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.2.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.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.
4444
```
4545

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

src/OpenTelemetry.AutoInstrumentation/.publicApi/net462/PublicAPI.Shipped.txt

+11-3
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,26 @@ OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState
1010
OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState.Activity.get -> System.Diagnostics.Activity?
1111
OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState.CallTargetState() -> void
1212
OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState.CallTargetState(System.Diagnostics.Activity! activity) -> void
13-
OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState.CallTargetState(System.Diagnostics.Activity! activity, object! state, System.DateTimeOffset? startTime) -> void
14-
OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState.CallTargetState(System.Diagnostics.Activity? activity, object! state) -> void
13+
OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState.CallTargetState(System.Diagnostics.Activity? activity, object? state) -> void
14+
OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState.CallTargetState(System.Diagnostics.Activity? activity, object? state, System.DateTimeOffset? startTime) -> void
15+
OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState.StartTime.get -> System.DateTimeOffset?
1516
OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState.State.get -> object?
1617
OpenTelemetry.AutoInstrumentation.DuckTyping.IDuckType
1718
OpenTelemetry.AutoInstrumentation.DuckTyping.IDuckType.Instance.get -> object!
1819
OpenTelemetry.AutoInstrumentation.DuckTyping.IDuckType.ToString() -> string!
1920
OpenTelemetry.AutoInstrumentation.DuckTyping.IDuckType.Type.get -> System.Type!
2021
OpenTelemetry.AutoInstrumentation.Instrumentations.AspNet.HttpModuleIntegration
22+
OpenTelemetry.AutoInstrumentation.Instrumentations.Kafka.Integrations.ConsumerCloseIntegration
23+
OpenTelemetry.AutoInstrumentation.Instrumentations.Kafka.Integrations.ConsumerConstructorIntegration
24+
OpenTelemetry.AutoInstrumentation.Instrumentations.Kafka.Integrations.ConsumerConsumeSyncIntegration
25+
OpenTelemetry.AutoInstrumentation.Instrumentations.Kafka.Integrations.ConsumerDisposeIntegration
26+
OpenTelemetry.AutoInstrumentation.Instrumentations.Kafka.Integrations.ProducerDeliveryHandlerActionIntegration
27+
OpenTelemetry.AutoInstrumentation.Instrumentations.Kafka.Integrations.ProducerProduceAsyncIntegration
28+
OpenTelemetry.AutoInstrumentation.Instrumentations.Kafka.Integrations.ProducerProduceSyncIntegration
2129
OpenTelemetry.AutoInstrumentation.Instrumentations.MongoDB.MongoClientIntegration
2230
OpenTelemetry.AutoInstrumentation.Instrumentations.NServiceBus.EndpointConfigurationIntegration
23-
OpenTelemetry.AutoInstrumentation.Instrumentations.Wcf.Service.ServiceHostIntegration
2431
OpenTelemetry.AutoInstrumentation.Instrumentations.Wcf.Client.WcfClientIntegration
32+
OpenTelemetry.AutoInstrumentation.Instrumentations.Wcf.Service.ServiceHostIntegration
2533
override OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetReturn<T>.ToString() -> string!
2634
override OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState.ToString() -> string!
2735
static OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetInvoker.BeginMethod<TIntegration, TTarget, TArg1, TArg2, TArg3, TArg4, TArg5, TArg6, TArg7, TArg8>(TTarget instance, ref TArg1 arg1, ref TArg2 arg2, ref TArg3 arg3, ref TArg4 arg4, ref TArg5 arg5, ref TArg6 arg6, ref TArg7 arg7, ref TArg8 arg8) -> OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState
Original file line numberDiff line numberDiff line change
@@ -1,12 +0,0 @@
1-
OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState.CallTargetState(System.Diagnostics.Activity? activity, object? state) -> void
2-
OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState.CallTargetState(System.Diagnostics.Activity? activity, object? state, System.DateTimeOffset? startTime) -> void
3-
OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState.StartTime.get -> System.DateTimeOffset?
4-
OpenTelemetry.AutoInstrumentation.Instrumentations.Kafka.Integrations.ConsumerCloseIntegration
5-
OpenTelemetry.AutoInstrumentation.Instrumentations.Kafka.Integrations.ConsumerConstructorIntegration
6-
OpenTelemetry.AutoInstrumentation.Instrumentations.Kafka.Integrations.ConsumerConsumeSyncIntegration
7-
OpenTelemetry.AutoInstrumentation.Instrumentations.Kafka.Integrations.ConsumerDisposeIntegration
8-
OpenTelemetry.AutoInstrumentation.Instrumentations.Kafka.Integrations.ProducerDeliveryHandlerActionIntegration
9-
OpenTelemetry.AutoInstrumentation.Instrumentations.Kafka.Integrations.ProducerProduceAsyncIntegration
10-
OpenTelemetry.AutoInstrumentation.Instrumentations.Kafka.Integrations.ProducerProduceSyncIntegration
11-
*REMOVED*OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState.CallTargetState(System.Diagnostics.Activity? activity, object! state) -> void
12-
*REMOVED*OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState.CallTargetState(System.Diagnostics.Activity! activity, object! state, System.DateTimeOffset? startTime) -> void

src/OpenTelemetry.AutoInstrumentation/.publicApi/net6.0/PublicAPI.Shipped.txt

+10-2
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,21 @@ OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState
1010
OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState.Activity.get -> System.Diagnostics.Activity?
1111
OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState.CallTargetState() -> void
1212
OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState.CallTargetState(System.Diagnostics.Activity! activity) -> void
13-
OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState.CallTargetState(System.Diagnostics.Activity! activity, object! state, System.DateTimeOffset? startTime) -> void
14-
OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState.CallTargetState(System.Diagnostics.Activity? activity, object! state) -> void
13+
OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState.CallTargetState(System.Diagnostics.Activity? activity, object? state) -> void
14+
OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState.CallTargetState(System.Diagnostics.Activity? activity, object? state, System.DateTimeOffset? startTime) -> void
15+
OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState.StartTime.get -> System.DateTimeOffset?
1516
OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState.State.get -> object?
1617
OpenTelemetry.AutoInstrumentation.DuckTyping.IDuckType
1718
OpenTelemetry.AutoInstrumentation.DuckTyping.IDuckType.Instance.get -> object!
1819
OpenTelemetry.AutoInstrumentation.DuckTyping.IDuckType.ToString() -> string!
1920
OpenTelemetry.AutoInstrumentation.DuckTyping.IDuckType.Type.get -> System.Type!
21+
OpenTelemetry.AutoInstrumentation.Instrumentations.Kafka.Integrations.ConsumerCloseIntegration
22+
OpenTelemetry.AutoInstrumentation.Instrumentations.Kafka.Integrations.ConsumerConstructorIntegration
23+
OpenTelemetry.AutoInstrumentation.Instrumentations.Kafka.Integrations.ConsumerConsumeSyncIntegration
24+
OpenTelemetry.AutoInstrumentation.Instrumentations.Kafka.Integrations.ConsumerDisposeIntegration
25+
OpenTelemetry.AutoInstrumentation.Instrumentations.Kafka.Integrations.ProducerDeliveryHandlerActionIntegration
26+
OpenTelemetry.AutoInstrumentation.Instrumentations.Kafka.Integrations.ProducerProduceAsyncIntegration
27+
OpenTelemetry.AutoInstrumentation.Instrumentations.Kafka.Integrations.ProducerProduceSyncIntegration
2028
OpenTelemetry.AutoInstrumentation.Instrumentations.Logger.LoggingBuilderIntegration
2129
OpenTelemetry.AutoInstrumentation.Instrumentations.MongoDB.MongoClientIntegration
2230
OpenTelemetry.AutoInstrumentation.Instrumentations.NServiceBus.EndpointConfigurationIntegration
Original file line numberDiff line numberDiff line change
@@ -1,12 +0,0 @@
1-
OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState.CallTargetState(System.Diagnostics.Activity? activity, object? state) -> void
2-
OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState.CallTargetState(System.Diagnostics.Activity? activity, object? state, System.DateTimeOffset? startTime) -> void
3-
OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState.StartTime.get -> System.DateTimeOffset?
4-
OpenTelemetry.AutoInstrumentation.Instrumentations.Kafka.Integrations.ConsumerCloseIntegration
5-
OpenTelemetry.AutoInstrumentation.Instrumentations.Kafka.Integrations.ConsumerConstructorIntegration
6-
OpenTelemetry.AutoInstrumentation.Instrumentations.Kafka.Integrations.ConsumerConsumeSyncIntegration
7-
OpenTelemetry.AutoInstrumentation.Instrumentations.Kafka.Integrations.ConsumerDisposeIntegration
8-
OpenTelemetry.AutoInstrumentation.Instrumentations.Kafka.Integrations.ProducerDeliveryHandlerActionIntegration
9-
OpenTelemetry.AutoInstrumentation.Instrumentations.Kafka.Integrations.ProducerProduceAsyncIntegration
10-
OpenTelemetry.AutoInstrumentation.Instrumentations.Kafka.Integrations.ProducerProduceSyncIntegration
11-
*REMOVED*OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState.CallTargetState(System.Diagnostics.Activity? activity, object! state) -> void
12-
*REMOVED*OpenTelemetry.AutoInstrumentation.CallTarget.CallTargetState.CallTargetState(System.Diagnostics.Activity! activity, object! state, System.DateTimeOffset? startTime) -> void

test/IntegrationTests/SqlClientMicrosoftTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ public SqlClientMicrosoftTests(ITestOutputHelper output, SqlServerFixture sqlSer
2020
public static IEnumerable<object[]> GetData()
2121
{
2222
#if NETFRAMEWORK
23-
// 3.1.2 is not supported on .NET Framework. For details check: https://github.com/open-telemetry/opentelemetry-dotnet/issues/4243
24-
return LibraryVersion.SqlClientMicrosoft.Where(x => x.First().ToString() != "3.1.2");
23+
// 3.1.* is not supported on .NET Framework. For details check: https://github.com/open-telemetry/opentelemetry-dotnet/issues/4243
24+
return LibraryVersion.SqlClientMicrosoft.Where(x => !x.First().ToString().StartsWith("3.1."));
2525
#else
2626
return LibraryVersion.SqlClientMicrosoft;
2727
#endif

0 commit comments

Comments
 (0)