Skip to content

Bump OTel 1.4.0-rc.2 #1967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pjanotti merged 5 commits into from
Jan 12, 2023
Merged

Bump OTel 1.4.0-rc.2 #1967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bd93434
Bump OTel 1.4.0-rc.2
xiang17 Jan 11, 2023
75113db
Bump version for `OpenTelemetry.Instrumentation.Runtime` and `OpenTel…
xiang17 Jan 11, 2023
35fe2d4
Update netfx redirection file.
Kielek Jan 12, 2023
5965fd2
Extend changelog with standard comment for updated core packages
Kielek Jan 12, 2023
378efb5
Merge branch 'main' into xiang17/versions
pjanotti Jan 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h

## [Unreleased](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/compare/v0.5.1-beta.3...HEAD)

This beta release is built on top of [OpenTelemetry .NET](https://github.com/open-telemetry/opentelemetry-dotnet):

- [Core components](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/VERSIONING.md#core-components):
[`1.4.0-rc.2`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.4.0-rc.2)
- `System.Diagnostics.DiagnosticSource`: [`7.0.0`](https://www.nuget.org/packages/System.Diagnostics.DiagnosticSource/7.0.0)

### Added

- Move `OpenTelemetry.AutoInstrumentation.Native.so` to `linux-x64` directory
Expand All @@ -17,6 +23,9 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h

### Changed

- Updated [Core components](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/VERSIONING.md#core-components):
[`1.4.0-rc.2`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.4.0-rc.2)

### Deprecated

### Removed
Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ OpenTelemetry .NET Automatic Instrumentation is built on top of
[OpenTelemetry .NET](https://github.com/open-telemetry/opentelemetry-dotnet):

- [Core components](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/VERSIONING.md#core-components):
[`1.4.0-rc.1`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.4.0-rc.1)
[`1.4.0-rc.2`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.4.0-rc.2)
- `System.Diagnostics.DiagnosticSource`: [`7.0.0`](https://www.nuget.org/packages/System.Diagnostics.DiagnosticSource/7.0.0)
referencing `System.Runtime.CompilerServices.Unsafe`: [`6.0.0`](https://www.nuget.org/packages/System.Runtime.CompilerServices.Unsafe/6.0.0)

Expand Down
6 changes: 3 additions & 3 deletions docs/config.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ To enable the OTLP exporter, set the `OTEL_TRACES_EXPORTER`/`OTEL_METRICS_EXPORT
environment variable to `otlp`.

To customize the OTLP exporter using environment variables, see the
[OTLP exporter documentation](https://github.com/open-telemetry/opentelemetry-dotnet/tree/core-1.4.0-rc.1/src/OpenTelemetry.Exporter.OpenTelemetryProtocol#environment-variables).
[OTLP exporter documentation](https://github.com/open-telemetry/opentelemetry-dotnet/tree/core-1.4.0-rc.2/src/OpenTelemetry.Exporter.OpenTelemetryProtocol#environment-variables).
Important environment variables include:

| Environment variable | Description | Default value |
Expand Down Expand Up @@ -206,7 +206,7 @@ The exporter exposes the metrics HTTP endpoint on `http://localhost:9464/metrics
and it caches the responses for 300 milliseconds.

See the
[Prometheus Exporter HttpListener documentation](https://github.com/open-telemetry/opentelemetry-dotnet/tree/core-1.4.0-rc.1/src/OpenTelemetry.Exporter.Prometheus.HttpListener).
[Prometheus Exporter HttpListener documentation](https://github.com/open-telemetry/opentelemetry-dotnet/tree/core-1.4.0-rc.2/src/OpenTelemetry.Exporter.Prometheus.HttpListener).
to learn more.

### Zipkin
Expand All @@ -215,7 +215,7 @@ To enable the Zipkin exporter, set the `OTEL_TRACES_EXPORTER` environment
variable to `zipkin`.

To customize the Zipkin exporter using environment variables,
see the [Zipkin exporter documentation](https://github.com/open-telemetry/opentelemetry-dotnet/tree/core-1.4.0-rc.1/src/OpenTelemetry.Exporter.Zipkin#configuration-using-environment-variables).
see the [Zipkin exporter documentation](https://github.com/open-telemetry/opentelemetry-dotnet/tree/core-1.4.0-rc.2/src/OpenTelemetry.Exporter.Zipkin#configuration-using-environment-variables).
Important environment variables include:

| Environment variable | Description | Default value |
Expand Down
38 changes: 19 additions & 19 deletions docs/plugins.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,37 +67,37 @@ public class MyPlugin

| Options type | NuGet package | NuGet version |
|------------------------------------------------------------------------------------------------|---------------------------------------------------|---------------|
| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.4.0-rc.1 |
| OpenTelemetry.Exporter.ZipkinExporterOptions | OpenTelemetry.Exporter.Zipkin | 1.4.0-rc.1 |
| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.4.0-rc.1 |
| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.4.0-rc.2 |
| OpenTelemetry.Exporter.ZipkinExporterOptions | OpenTelemetry.Exporter.Zipkin | 1.4.0-rc.2 |
| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.4.0-rc.2 |
| OpenTelemetry.Instrumentation.AspNet.AspNetInstrumentationOptions | OpenTelemetry.Instrumentation.AspNet | 1.0.0-rc9.7 |
| OpenTelemetry.Instrumentation.AspNetCore.AspNetCoreInstrumentationOptions | OpenTelemetry.Instrumentation.AspNetCore | 1.0.0-rc9.10 |
| OpenTelemetry.Instrumentation.GrpcNetClient.GrpcClientInstrumentationOptions | OpenTelemetry.Instrumentation.GrpcNetClient | 1.0.0-rc9.10 |
| OpenTelemetry.Instrumentation.Http.HttpClientInstrumentationOptions | OpenTelemetry.Instrumentation.Http | 1.0.0-rc9.10 |
| OpenTelemetry.Instrumentation.SqlClient.SqlClientInstrumentationOptions | OpenTelemetry.Instrumentation.SqlClient | 1.0.0-rc9.10 |
| OpenTelemetry.Instrumentation.StackExchangeRedis.StackExchangeRedisCallsInstrumentationOptions | OpenTelemetry.Instrumentation.StackExchangeRedis" | 1.0.0-rc9.7 |
| OpenTelemetry.Instrumentation.AspNetCore.AspNetCoreInstrumentationOptions | OpenTelemetry.Instrumentation.AspNetCore | 1.0.0-rc9.11 |
| OpenTelemetry.Instrumentation.GrpcNetClient.GrpcClientInstrumentationOptions | OpenTelemetry.Instrumentation.GrpcNetClient | 1.0.0-rc9.11 |
| OpenTelemetry.Instrumentation.Http.HttpClientInstrumentationOptions | OpenTelemetry.Instrumentation.Http | 1.0.0-rc9.11 |
| OpenTelemetry.Instrumentation.SqlClient.SqlClientInstrumentationOptions | OpenTelemetry.Instrumentation.SqlClient | 1.0.0-rc9.11 |
| OpenTelemetry.Instrumentation.StackExchangeRedis.StackExchangeRedisCallsInstrumentationOptions | OpenTelemetry.Instrumentation.StackExchangeRedis | 1.0.0-rc9.7 |
| OpenTelemetry.Instrumentation.MySqlData.MySqlDataInstrumentationOptions | OpenTelemetry.Instrumentation.MySqlData | 1.0.0-beta.4 |
| OpenTelemetry.Instrumentation.Wcf.WcfInstrumentationOptions | OpenTelemetry.Instrumentation.Wcf | 1.0.0-rc.8 |
| OpenTelemetry.Instrumentation.Wcf.WcfInstrumentationOptions | OpenTelemetry.Instrumentation.Wcf | 1.0.0-rc.8 |

### Metrics

| Options type | NuGet package | NuGet version |
|----------------------------------------------------------------------------------|------------------------------------------------|---------------|
| OpenTelemetry.Metrics.MetricReaderOptions | OpenTelemetry | 1.4.0-rc.1 |
| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.4.0-rc.1 |
| OpenTelemetry.Exporter.PrometheusExporterOptions | OpenTelemetry.Exporter.Prometheus.HttpListener | 1.4.0-rc.1 |
| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.4.0-rc.1 |
| OpenTelemetry.Instrumentation.AspNetCore.AspNetCoreMetricsInstrumentationOptions | OpenTelemetry.Instrumentation.Process | 1.0.0-rc9.10 |
| OpenTelemetry.Instrumentation.Runtime.RuntimeInstrumentationOptions | OpenTelemetry.Instrumentation.Runtime | 1.1.0-beta.2 |
| OpenTelemetry.Instrumentation.Process.ProcessInstrumentationOptions | OpenTelemetry.Instrumentation.Process | 1.0.0-alpha.3 |
| OpenTelemetry.Metrics.MetricReaderOptions | OpenTelemetry | 1.4.0-rc.2 |
| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.4.0-rc.2 |
| OpenTelemetry.Exporter.PrometheusExporterOptions | OpenTelemetry.Exporter.Prometheus.HttpListener | 1.4.0-rc.2 |
| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.4.0-rc.2 |
| OpenTelemetry.Instrumentation.AspNetCore.AspNetCoreMetricsInstrumentationOptions | OpenTelemetry.Instrumentation.AspNetCore | 1.0.0-rc9.11 |
| OpenTelemetry.Instrumentation.Runtime.RuntimeInstrumentationOptions | OpenTelemetry.Instrumentation.Runtime | 1.1.0-beta.3 |
| OpenTelemetry.Instrumentation.Process.ProcessInstrumentationOptions | OpenTelemetry.Instrumentation.Process | 1.0.0-alpha.4 |

### Logs

| Options type | NuGet package | NuGet version |
|-----------------------------------------------|----------------------------------------------|---------------|
| OpenTelemetry.Logs.OpenTelemetryLoggerOptions | OpenTelemetry | 1.4.0-rc.1 |
| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.4.0-rc.1 |
| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.4.0-rc.1 |
| OpenTelemetry.Logs.OpenTelemetryLoggerOptions | OpenTelemetry | 1.4.0-rc.2 |
| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.4.0-rc.2 |
| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.4.0-rc.2 |

## Requirements

Expand Down
56 changes: 28 additions & 28 deletions nuget/OpenTelemetry.AutoInstrumentation.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,38 +13,38 @@
<repository type="git" url="https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation" />
<dependencies>
<group targetFramework="net6.0">
<dependency id="OpenTelemetry" version="1.4.0-rc.1" />
<dependency id="OpenTelemetry.Api" version="1.4.0-rc.1" />
<dependency id="OpenTelemetry.Exporter.Console" version="1.4.0-rc.1" />
<dependency id="OpenTelemetry.Exporter.OpenTelemetryProtocol" version="1.4.0-rc.1" />
<dependency id="OpenTelemetry.Exporter.Prometheus.HttpListener" version="1.4.0-rc.1" />
<dependency id="OpenTelemetry.Exporter.Zipkin" version="1.4.0-rc.1" />
<dependency id="OpenTelemetry.Extensions.Propagators" version="1.4.0-rc.1" />
<dependency id="OpenTelemetry.Instrumentation.GrpcNetClient" version="1.0.0-rc9.10" />
<dependency id="OpenTelemetry.Instrumentation.Http" version="1.0.0-rc9.10" />
<dependency id="OpenTelemetry.Instrumentation.Runtime" version="1.1.0-beta.2" />
<dependency id="OpenTelemetry.Instrumentation.Process" version="1.0.0-alpha.3" />
<dependency id="OpenTelemetry.Instrumentation.SqlClient" version="1.0.0-rc9.10" />
<dependency id="OpenTelemetry" version="1.4.0-rc.2" />
<dependency id="OpenTelemetry.Api" version="1.4.0-rc.2" />
<dependency id="OpenTelemetry.Exporter.Console" version="1.4.0-rc.2" />
<dependency id="OpenTelemetry.Exporter.OpenTelemetryProtocol" version="1.4.0-rc.2" />
<dependency id="OpenTelemetry.Exporter.Prometheus.HttpListener" version="1.4.0-rc.2" />
<dependency id="OpenTelemetry.Exporter.Zipkin" version="1.4.0-rc.2" />
<dependency id="OpenTelemetry.Extensions.Propagators" version="1.4.0-rc.2" />
<dependency id="OpenTelemetry.Instrumentation.GrpcNetClient" version="1.0.0-rc9.11" />
<dependency id="OpenTelemetry.Instrumentation.Http" version="1.0.0-rc9.11" />
<dependency id="OpenTelemetry.Instrumentation.Runtime" version="1.1.0-beta.3" />
<dependency id="OpenTelemetry.Instrumentation.Process" version="1.0.0-alpha.4" />
<dependency id="OpenTelemetry.Instrumentation.SqlClient" version="1.0.0-rc9.11" />
<dependency id="OpenTelemetry.Instrumentation.Wcf" version="1.0.0-rc.8" />
<dependency id="OpenTelemetry.Shims.OpenTracing" version="1.0.0-rc9.10" />
<dependency id="OpenTelemetry.Instrumentation.AspNetCore" version="1.0.0-rc9.10" />
<dependency id="OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs" version="1.4.0-rc.1" />
<dependency id="OpenTelemetry.Shims.OpenTracing" version="1.0.0-rc9.11" />
<dependency id="OpenTelemetry.Instrumentation.AspNetCore" version="1.0.0-rc9.11" />
<dependency id="OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs" version="1.4.0-rc.2" />
</group>
<group targetFramework=".NETFramework4.6.2">
<dependency id="OpenTelemetry" version="1.4.0-rc.1" />
<dependency id="OpenTelemetry.Api" version="1.4.0-rc.1" />
<dependency id="OpenTelemetry.Exporter.Console" version="1.4.0-rc.1" />
<dependency id="OpenTelemetry.Exporter.OpenTelemetryProtocol" version="1.4.0-rc.1" />
<dependency id="OpenTelemetry.Exporter.Prometheus.HttpListener" version="1.4.0-rc.1" />
<dependency id="OpenTelemetry.Exporter.Zipkin" version="1.4.0-rc.1" />
<dependency id="OpenTelemetry.Extensions.Propagators" version="1.4.0-rc.1" />
<dependency id="OpenTelemetry.Instrumentation.GrpcNetClient" version="1.0.0-rc9.10" />
<dependency id="OpenTelemetry.Instrumentation.Http" version="1.0.0-rc9.10" />
<dependency id="OpenTelemetry.Instrumentation.Runtime" version="1.1.0-beta.2" />
<dependency id="OpenTelemetry.Instrumentation.Process" version="1.0.0-alpha.3" />
<dependency id="OpenTelemetry.Instrumentation.SqlClient" version="1.0.0-rc9.10" />
<dependency id="OpenTelemetry" version="1.4.0-rc.2" />
<dependency id="OpenTelemetry.Api" version="1.4.0-rc.2" />
<dependency id="OpenTelemetry.Exporter.Console" version="1.4.0-rc.2" />
<dependency id="OpenTelemetry.Exporter.OpenTelemetryProtocol" version="1.4.0-rc.2" />
<dependency id="OpenTelemetry.Exporter.Prometheus.HttpListener" version="1.4.0-rc.2" />
<dependency id="OpenTelemetry.Exporter.Zipkin" version="1.4.0-rc.2" />
<dependency id="OpenTelemetry.Extensions.Propagators" version="1.4.0-rc.2" />
<dependency id="OpenTelemetry.Instrumentation.GrpcNetClient" version="1.0.0-rc9.11" />
<dependency id="OpenTelemetry.Instrumentation.Http" version="1.0.0-rc9.11" />
<dependency id="OpenTelemetry.Instrumentation.Runtime" version="1.1.0-beta.3" />
<dependency id="OpenTelemetry.Instrumentation.Process" version="1.0.0-alpha.4" />
<dependency id="OpenTelemetry.Instrumentation.SqlClient" version="1.0.0-rc9.11" />
<dependency id="OpenTelemetry.Instrumentation.Wcf" version="1.0.0-rc.8" />
<dependency id="OpenTelemetry.Shims.OpenTracing" version="1.0.0-rc9.10" />
<dependency id="OpenTelemetry.Shims.OpenTracing" version="1.0.0-rc9.11" />
<dependency id="OpenTelemetry.Instrumentation.AspNet" version="1.0.0-rc9.7" />
</group>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ void CorProfiler::InitNetFxAssemblyRedirectsMap()
{ L"OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule", {1, 0, 0, 7} },
{ L"OpenTelemetry.Instrumentation.GrpcNetClient", {1, 0, 0, 0} },
{ L"OpenTelemetry.Instrumentation.Http", {1, 0, 0, 0} },
{ L"OpenTelemetry.Instrumentation.Process", {1, 0, 0, 3} },
{ L"OpenTelemetry.Instrumentation.Runtime", {1, 1, 0, 2} },
{ L"OpenTelemetry.Instrumentation.Process", {1, 0, 0, 4} },
{ L"OpenTelemetry.Instrumentation.Runtime", {1, 1, 0, 3} },
{ L"OpenTelemetry.Instrumentation.SqlClient", {1, 0, 0, 0} },
{ L"OpenTelemetry.Instrumentation.Wcf", {1, 0, 0, 8} },
{ L"OpenTelemetry.Shims.OpenTracing", {1, 0, 0, 0} },
Expand Down
Loading