Skip to content
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.

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

Bump OTel to 1.4.0-rc.3 #2157

Merged
merged 15 commits into from
Feb 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h
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)
[`1.4.0-rc.3`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.4.0-rc.3)
xiang17 marked this conversation as resolved.
Show resolved Hide resolved
- `System.Diagnostics.DiagnosticSource`: [`7.0.0`](https://www.nuget.org/packages/System.Diagnostics.DiagnosticSource/7.0.0)

### Added
Expand All @@ -24,7 +24,7 @@ This beta release is built on top of [OpenTelemetry .NET](https://github.com/ope
### 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)
[`1.4.0-rc.3`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.4.0-rc.3)
- Move `OpenTelemetry.AutoInstrumentation.Native.so` to `linux-x64` directory
in `tracer-home` for Linux glibc, `OpenTelemetry.AutoInstrumentation.Native.so`
to `linux-musl-x64` for Linux musl and
Expand Down
10 changes: 5 additions & 5 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
</PropertyGroup>

<ItemGroup>
<PackageVersion Include="OpenTelemetry" Version="1.4.0-rc.2" />
<PackageVersion Include="OpenTelemetry.Api" Version="1.4.0-rc.2" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.4.0-rc.2" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.4.0-rc.2" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.11" />
<PackageVersion Include="OpenTelemetry" Version="1.4.0-rc.3" />
<PackageVersion Include="OpenTelemetry.Api" Version="1.4.0-rc.3" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.4.0-rc.3" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.4.0-rc.3" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.12" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Wcf" Version="1.0.0-rc.8" />
</ItemGroup>
</Project>
58 changes: 32 additions & 26 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -209,36 +209,39 @@ separate copyright notices and license terms:

Library Google.Protobuf is under the following copyright:
Copyright 2008 Google Inc. All rights reserved under BSD-3-Clause license
(https://github.com/protocolbuffers/protobuf/blob/main/LICENSE).
(<https://github.com/protocolbuffers/protobuf/blob/main/LICENSE>).

Libraries

- Google.Protobuf,
- Grpc.Net.Common,
- Grpc.Net.Client
- Grpc.Net.Common,
are under the following copyright:
Copyright 2019 The gRPC Authors under Apache License Version 2.0
(https://github.com/grpc/grpc-dotnet/blob/master/LICENSE).
(<https://github.com/grpc/grpc-dotnet/blob/master/LICENSE>).

Libraries

- OpenTelemetry
- OpenTelemetry.Api,
- OpenTelemetry.Api.ProviderBuilderExtensions,
xiang17 marked this conversation as resolved.
Show resolved Hide resolved
- OpenTelemetry.Exporter.Console,
- OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs,
- OpenTelemetry.Exporter.OpenTelemetryProtocol,
- OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs,
- OpenTelemetry.Exporter.Prometheus.HttpListener,
- OpenTelemetry.Exporter.Zipkin,
- OpenTelemetry.Extensions.DependencyInjection,
- OpenTelemetry.Extensions.Propagators,
- OpenTelemetry.Instrumentation.AspNetCore,
- OpenTelemetry.Instrumentation.GrpcNetClient,
- OpenTelemetry.Instrumentation.Http,
- OpenTelemetry.Instrumentation.SqlClient,
- OpenTelemetry.Shims.OpenTracing,
- OpenTelemetry
are under the following copyright:
Copyright The OpenTelemetry Authors under Apache License Version 2.0
(https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/LICENSE).
(<https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/LICENSE>).

Libraries

- OpenTelemetry.Api,
- OpenTelemetry.Instrumentation.EntityFrameworkCore,
- OpenTelemetry.Instrumentation.MySqlData,
Expand All @@ -249,60 +252,63 @@ Libraries
- OpenTelemetry.Instrumentation.Wcf
are under the following copyright:
Copyright The OpenTelemetry Authors under Apache License Version 2.0
(https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/main/LICENSE).
(<https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/main/LICENSE>).

Library OpenTracing is under the following copyright:
Copyright The OpenTracing Authors under Apache License Version 2.0
(https://github.com/opentracing/opentracing-csharp/blob/master/LICENSE).
(<https://github.com/opentracing/opentracing-csharp/blob/master/LICENSE>).

Libraries
- System.Diagnostics.DiagnosticSource,
- System.Security.Permissions,

- Microsoft.Extensions.Configuration,
- Microsoft.Extensions.Configuration.Abstractions,
- Microsoft.Extensions.Configuration.Binder,
- Microsoft.Extensions.Configuration.EnvironmentVariables,
xiang17 marked this conversation as resolved.
Show resolved Hide resolved
- Microsoft.Extensions.Configuration,
- Microsoft.Extensions.DependencyInjection.Abstractions,
- Microsoft.Extensions.DependencyInjection,
- Microsoft.Extensions.DependencyInjection.Abstractions,
- Microsoft.Extensions.Logging,
- Microsoft.Extensions.Logging.Abstractions,
- Microsoft.Extensions.Logging.Configuration,
- Microsoft.Extensions.Logging,
- Microsoft.Extensions.Options.ConfigurationExtensions,
- Microsoft.Extensions.Options,
- Microsoft.Extensions.Options.ConfigurationExtensions,
- Microsoft.Extensions.Primitives
- System.Diagnostics.DiagnosticSource,
- System.Security.Permissions,
are under the following copyright:
Copyright (c) .NET Foundation and Contributors under the MIT License (MIT)
(https://github.com/dotnet/runtime/blob/main/LICENSE.TXT).
(<https://github.com/dotnet/runtime/blob/main/LICENSE.TXT>).

Libraries

- System.Private.ServiceModel,
- System.ServiceModel.Primitives,
- System.ServiceModel
are under the following copyright:
Copyright (c) .NET Foundation and Contributors under the MIT License (MIT)
(https://github.com/dotnet/wcf/blob/main/LICENSE.TXT).
(<https://github.com/dotnet/wcf/blob/main/LICENSE.TXT>).

Library DnsClient is under the following copyright:
Copyright The DnsClient.NET Authors under Apache License Version 2.0
(https://github.com/opentracing/opentracing-csharp/blob/master/LICENSE).
(<https://github.com/opentracing/opentracing-csharp/blob/master/LICENSE>).

Libraries

- MongoDB.Bson,
- MongoDB.Driver.Core,
- libzstd,
- snappy32,
- snappy64,
- MongoDB.Libmongocrypt,
- libmongocrypt,
- libzstd,
- mongocrypt
- snappy32,
- snappy64,
are under the following copyright:
Copyright 2010-present MongoDB Inc. under Apache License Version 2.0
(https://github.com/mongodb/mongo-csharp-driver/blob/master/License.txt).
(<https://github.com/mongodb/mongo-csharp-driver/blob/master/License.txt>).

Library MongoDB.Driver.Core.Extensions.DiagnosticSources is under the following copyright:
Copyright MongoDB.Driver.Core.Extensions.DiagnosticSources Authors under Apache License Version 2.0
(https://github.com/jbogard/MongoDB.Driver.Core.Extensions.DiagnosticSources/blob/master/LICENSE).
Copyright MongoDB.Driver.Core.Extensions.DiagnosticSources Authors under Apache
License Version 2.0
(<https://github.com/jbogard/MongoDB.Driver.Core.Extensions.DiagnosticSources/blob/master/LICENSE>).

Library SharpCompress is under the following copyright:
Copyright (c) 2014 Adam Hathcock under the MIT License (MIT)
(https://github.com/adamhathcock/sharpcompress/blob/master/LICENSE.txt).
(<https://github.com/adamhathcock/sharpcompress/blob/master/LICENSE.txt>).
2 changes: 1 addition & 1 deletion docs/README.md
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.2`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.4.0-rc.2)
[`1.4.0-rc.3`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.4.0-rc.3)
- `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
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,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.2/src/OpenTelemetry.Exporter.OpenTelemetryProtocol#environment-variables).
[OTLP exporter documentation](https://github.com/open-telemetry/opentelemetry-dotnet/tree/core-1.4.0-rc.3/src/OpenTelemetry.Exporter.OpenTelemetryProtocol#environment-variables).
Important environment variables include:

| Environment variable | Description | Default value |
Expand Down Expand Up @@ -266,7 +266,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.2/src/OpenTelemetry.Exporter.Prometheus.HttpListener).
[Prometheus Exporter HttpListener documentation](https://github.com/open-telemetry/opentelemetry-dotnet/tree/core-1.4.0-rc.3/src/OpenTelemetry.Exporter.Prometheus.HttpListener).
to learn more.

### Zipkin
Expand All @@ -275,7 +275,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.2/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.3/src/OpenTelemetry.Exporter.Zipkin#configuration-using-environment-variables).
Important environment variables include:

| Environment variable | Description | Default value |
Expand Down
36 changes: 18 additions & 18 deletions docs/plugins.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,39 +78,39 @@ public class MyPlugin

| Options type | NuGet package | NuGet version |
|------------------------------------------------------------------------------------------------|---------------------------------------------------|---------------|
| 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.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.4.0-rc.3 |
| OpenTelemetry.Exporter.ZipkinExporterOptions | OpenTelemetry.Exporter.Zipkin | 1.4.0-rc.3 |
| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.4.0-rc.3 |
| OpenTelemetry.Instrumentation.AspNet.AspNetInstrumentationOptions | OpenTelemetry.Instrumentation.AspNet | 1.0.0-rc9.7 |
| OpenTelemetry.Instrumentation.AspNetCore.AspNetCoreInstrumentationOptions | OpenTelemetry.Instrumentation.AspNetCore | 1.0.0-rc9.11 |
| OpenTelemetry.Instrumentation.AspNetCore.AspNetCoreInstrumentationOptions | OpenTelemetry.Instrumentation.AspNetCore | 1.0.0-rc9.12 |
| OpenTelemetry.Instrumentation.EntityFrameworkCore.EntityFrameworkInstrumentationOptions | OpenTelemetry.Instrumentation.EntityFrameworkCore | 1.0.0-beta.4 |
| 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.GrpcNetClient.GrpcClientInstrumentationOptions | OpenTelemetry.Instrumentation.GrpcNetClient | 1.0.0-rc9.12 |
| OpenTelemetry.Instrumentation.Http.HttpClientInstrumentationOptions | OpenTelemetry.Instrumentation.Http | 1.0.0-rc9.12 |
| OpenTelemetry.Instrumentation.Quartz.QuartzInstrumentationOptions | OpenTelemetry.Instrumentation.Quartz | 1.0.0-alpha.1 |
| OpenTelemetry.Instrumentation.SqlClient.SqlClientInstrumentationOptions | OpenTelemetry.Instrumentation.SqlClient | 1.0.0-rc9.11 |
| OpenTelemetry.Instrumentation.SqlClient.SqlClientInstrumentationOptions | OpenTelemetry.Instrumentation.SqlClient | 1.0.0-rc9.12 |
| 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.MySqlData.MySqlDataInstrumentationOptions | OpenTelemetry.Instrumentation.MySqlData | 1.0.0-beta.5 |
| 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.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 |
| OpenTelemetry.Metrics.MetricReaderOptions | OpenTelemetry | 1.4.0-rc.3 |
| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.4.0-rc.3 |
| OpenTelemetry.Exporter.PrometheusExporterOptions | OpenTelemetry.Exporter.Prometheus.HttpListener | 1.4.0-rc.3 |
| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.4.0-rc.3 |
| OpenTelemetry.Instrumentation.AspNetCore.AspNetCoreMetricsInstrumentationOptions | OpenTelemetry.Instrumentation.AspNetCore | 1.0.0-rc9.12 |
| OpenTelemetry.Instrumentation.Runtime.RuntimeInstrumentationOptions | OpenTelemetry.Instrumentation.Runtime | 1.1.0-beta.4 |
| OpenTelemetry.Instrumentation.Process.ProcessInstrumentationOptions | OpenTelemetry.Instrumentation.Process | 1.0.0-alpha.5 |

### Logs

| Options type | NuGet package | NuGet version |
|-----------------------------------------------|----------------------------------------------|---------------|
| 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 |
| OpenTelemetry.Logs.OpenTelemetryLoggerOptions | OpenTelemetry | 1.4.0-rc.3 |
| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.4.0-rc.3 |
| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.4.0-rc.3 |

## Requirements

Expand Down