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 Auto to 1.0.0-rc.1 #268

Merged
merged 1 commit into from
Jun 27, 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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,16 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h

## [Unreleased](https://github.com/signalfx/splunk-otel-dotnet/compare/v0.2.0-beta.1...HEAD)

The is a release candidate,
built on top of [OpenTelemetry .NET Auto Instrumentation v1.0.0-rc.1](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.0.0-rc.1).

### Added

### Changed

- Updated [OpenTelemetry .NET Auto Instrumentation](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation):
[`1.0.0-rc.1`](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.0.0-rc.1).

### Deprecated

### Removed
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Splunk Distribution of OpenTelemetry .NET

[![OpenTelemetry .NET](https://img.shields.io/badge/OTel-1.4.0-blueviolet)](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.4.0)
[![OpenTelemetry .NET Auto Instrumentation](https://img.shields.io/badge/OTelAuto-v0.7.0-blueviolet)](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v0.7.0)
[![OpenTelemetry .NET](https://img.shields.io/badge/OTel-1.5.1-blueviolet)](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.5.1)
[![OpenTelemetry .NET Auto Instrumentation](https://img.shields.io/badge/OTelAuto-v1.0.0rc.1-blueviolet)](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.0.0-rc.1)
[![Splunk GDI Specification](https://img.shields.io/badge/GDI-1.5.0-blueviolet)](https://github.com/signalfx/gdi-specification/releases/tag/v1.5.0)
[![Keep a Changelog](https://img.shields.io/badge/changelog-Keep%20a%20Changelog-%23E05735)](CHANGELOG.md)
[![LICENSE](https://img.shields.io/github/license/signalfx/splunk-otel-dotnet)](LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion build/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Build : NukeBuild
[Parameter("Platform to build - x86 or x64. Default is 'x64'")]
readonly MSBuildTargetPlatform Platform = MSBuildTargetPlatform.x64;

const string OpenTelemetryAutoInstrumentationDefaultVersion = "v0.7.0";
const string OpenTelemetryAutoInstrumentationDefaultVersion = "v1.0.0-rc.1";
[Parameter($"OpenTelemetry AutoInstrumentation dependency version - Default is '{OpenTelemetryAutoInstrumentationDefaultVersion}'")]
readonly string OpenTelemetryAutoInstrumentationVersion = OpenTelemetryAutoInstrumentationDefaultVersion;

Expand Down
6 changes: 3 additions & 3 deletions docs/advanced-config.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

## OpenTelemetry configuration

See [Open Telemetry Auto Instrumentation documentation](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v0.7.0/docs/config.md)
See [Open Telemetry Auto Instrumentation documentation](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v1.0.0-rc.1/docs/config.md)
for configuration details.

## Splunk distribution configuration
Expand All @@ -23,7 +23,7 @@ Download and install the latest binaries from

When running your application, make sure to:

1. Set the [resources](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v0.7.0/docs/config.md#resources).
1. Set the [resources](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v1.0.0-rc.1/docs/config.md#resources).
1. Set the environment variables from the table below.

| Environment variable | .NET version | Value |
Expand All @@ -45,7 +45,7 @@ When running your application, make sure to:
| `OTEL_DOTNET_AUTO_HOME` | All versions | `$INSTALL_DIR` |
| `OTEL_DOTNET_AUTO_PLUGINS` | All versions | `Splunk.OpenTelemetry.AutoInstrumentation.Plugin, Splunk.OpenTelemetry.AutoInstrumentation` |

> Some settings can be omitted on .NET. For more information, see the [documentation](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v0.7.0/docs/config.md#net-clr-profiler).
> Some settings can be omitted on .NET. For more information, see the [documentation](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v1.0.0-rc.1/docs/config.md#net-clr-profiler).

## Splunk plugin settings

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="OpenTelemetry.Api" Version="1.4.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.4.0" />
<PackageReference Include="OpenTelemetry.Api" Version="1.5.1" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.5.1" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
<Reference Include="System.Configuration" />
<Reference Include="System.Web" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNet" Version="1.0.0-rc9.8" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNet" Version="1.0.0-rc9.9" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.14" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.5.0-beta.1" />
</ItemGroup>

<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,24 +35,20 @@
/net/OpenTelemetry.Instrumentation.Runtime.dll,
/net/OpenTelemetry.Instrumentation.SqlClient.dll,
/net/OpenTelemetry.Instrumentation.StackExchangeRedis.dll,
/net/OpenTelemetry.Instrumentation.Wcf.dll,
/net/OpenTelemetry.ResourceDetectors.Container.dll,
/net/OpenTelemetry.Shims.OpenTracing.dll,
/net/OpenTelemetry.dll,
/net/OpenTracing.dll,
/net/Splunk.OpenTelemetry.AutoInstrumentation.dll,
/net/System.Diagnostics.DiagnosticSource.dll,
/net/System.Private.ServiceModel.dll,
/net/System.Security.Permissions.dll,
/net/System.ServiceModel.Primitives.dll,
/net/System.ServiceModel.dll,
/net/ruleEngine.json,
/store/x64/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
/store/x64/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
/store/x64/net6.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
/store/x64/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
/store/x64/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
/store/x64/net6.0/microsoft.extensions.logging.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
/store/x64/net6.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
/store/x64/net6.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
/store/x64/net6.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
/store/x64/net6.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
Expand All @@ -64,7 +60,7 @@
/store/x64/net7.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
/store/x64/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
/store/x64/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
/store/x64/net7.0/microsoft.extensions.logging.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
/store/x64/net7.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
/store/x64/net7.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
/store/x64/net7.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
/store/x64/net7.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
Expand All @@ -75,7 +71,7 @@
/store/x86/net6.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
/store/x86/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
/store/x86/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
/store/x86/net6.0/microsoft.extensions.logging.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
/store/x86/net6.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
/store/x86/net6.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
/store/x86/net6.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
/store/x86/net6.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
Expand All @@ -87,7 +83,7 @@
/store/x86/net7.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
/store/x86/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
/store/x86/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
/store/x86/net7.0/microsoft.extensions.logging.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
/store/x86/net7.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
/store/x86/net7.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
/store/x86/net7.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
/store/x86/net7.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,24 +35,20 @@
/net/OpenTelemetry.Instrumentation.Runtime.dll,
/net/OpenTelemetry.Instrumentation.SqlClient.dll,
/net/OpenTelemetry.Instrumentation.StackExchangeRedis.dll,
/net/OpenTelemetry.Instrumentation.Wcf.dll,
/net/OpenTelemetry.ResourceDetectors.Container.dll,
/net/OpenTelemetry.Shims.OpenTracing.dll,
/net/OpenTelemetry.dll,
/net/OpenTracing.dll,
/net/Splunk.OpenTelemetry.AutoInstrumentation.dll,
/net/System.Diagnostics.DiagnosticSource.dll,
/net/System.Private.ServiceModel.dll,
/net/System.Security.Permissions.dll,
/net/System.ServiceModel.Primitives.dll,
/net/System.ServiceModel.dll,
/net/ruleEngine.json,
/store/x64/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
/store/x64/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
/store/x64/net6.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
/store/x64/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
/store/x64/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
/store/x64/net6.0/microsoft.extensions.logging.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
/store/x64/net6.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
/store/x64/net6.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
/store/x64/net6.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
/store/x64/net6.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
Expand All @@ -64,7 +60,7 @@
/store/x64/net7.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
/store/x64/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
/store/x64/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
/store/x64/net7.0/microsoft.extensions.logging.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
/store/x64/net7.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
/store/x64/net7.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
/store/x64/net7.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
/store/x64/net7.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
Expand All @@ -75,7 +71,7 @@
/store/x86/net6.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
/store/x86/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
/store/x86/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
/store/x86/net6.0/microsoft.extensions.logging.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
/store/x86/net6.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
/store/x86/net6.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
/store/x86/net6.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
/store/x86/net6.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
Expand All @@ -87,7 +83,7 @@
/store/x86/net7.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
/store/x86/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
/store/x86/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
/store/x86/net7.0/microsoft.extensions.logging.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
/store/x86/net7.0/microsoft.extensions.logging.abstractions/7.0.1/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll,
/store/x86/net7.0/microsoft.extensions.logging.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll,
/store/x86/net7.0/microsoft.extensions.logging/7.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll,
/store/x86/net7.0/microsoft.extensions.options.configurationextensions/7.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
Expand Down
Loading