Skip to content

Commit

Permalink
Release 0.4.0-beta.1 (#1506)
Browse files Browse the repository at this point in the history
  • Loading branch information
pellared authored Oct 27, 2022
1 parent 0e19ef8 commit d02b9cc
Show file tree
Hide file tree
Showing 15 changed files with 31 additions and 23 deletions.
8 changes: 5 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
# Changelog

All notable changes to this project are documented in this file.
All notable changes to this component are documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

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

## [0.4.0-beta.1](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v0.4.0-beta.1)

### Added

Expand Down
2 changes: 1 addition & 1 deletion OpenTelemetry.DotNet.Auto.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ function Install-OpenTelemetryCore() {
[string]$InstallDir = "<auto>"
)

$version = "v0.3.1-beta.1"
$version = "v0.4.0-beta.1"
$installDir = Get-CLIInstallDir-From-InstallDir $InstallDir
$tempDir = Get-Temp-Directory
$dlPath = $null
Expand Down
1 change: 1 addition & 0 deletions dev/envvars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,4 @@ export OTEL_DOTNET_AUTO_EXCLUDE_PROCESSES=${OTEL_DOTNET_AUTO_EXCLUDE_PROCESSES:-
# Enable console exporters
export OTEL_DOTNET_AUTO_TRACES_CONSOLE_EXPORTER_ENABLED=${OTEL_DOTNET_AUTO_TRACES_CONSOLE_EXPORTER_ENABLED:-true}
export OTEL_DOTNET_AUTO_METRICS_CONSOLE_EXPORTER_ENABLED=${OTEL_DOTNET_AUTO_METRICS_CONSOLE_EXPORTER_ENABLED:-true}
export OTEL_DOTNET_AUTO_LOGS_CONSOLE_EXPORTER_ENABLED=${OTEL_DOTNET_AUTO_LOGS_CONSOLE_EXPORTER_ENABLED:-true}
10 changes: 5 additions & 5 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ to .NET applications without having to modify their source code.

⚠️ The following documentation refers to the in-development version
of OpenTelemetry .NET Automatic Instrumentation. Docs for the latest version
([0.3.1-beta.1](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/latest))
can be found [here](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v0.3.1-beta.1/docs/README.md).
([0.4.0-beta.1](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/latest))
can be found [here](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v0.4.0-beta.1/docs/README.md).

---

Expand Down Expand Up @@ -128,7 +128,7 @@ and instrument your .NET application using the provided Shell scripts.
Example usage:

```sh
curl -sSfL https://raw.githubusercontent.com/open-telemetry/opentelemetry-dotnet-instrumentation/v0.3.1-beta.1/otel-dotnet-auto-install.sh -O
curl -sSfL https://raw.githubusercontent.com/open-telemetry/opentelemetry-dotnet-instrumentation/v0.4.0-beta.1/otel-dotnet-auto-install.sh -O
sh ./otel-dotnet-auto-install.sh
. $HOME/.otel-dotnet-auto/instrument.sh
OTEL_SERVICE_NAME=myapp OTEL_RESOURCE_ATTRIBUTES=deployment.environment=staging,service.version=1.0.0 dotnet run
Expand All @@ -142,7 +142,7 @@ uses environment variables as parameters:
| `OTEL_DOTNET_AUTO_HOME` | Location where binaries are to be installed | No | `$HOME/.otel-dotnet-auto` |
| `OS_TYPE` | Possible values: `linux-glibc`, `linux-musl`, `macos`, `windows` | No | *Calculated* |
| `TMPDIR` | Temporary directory used when downloading the files | No | `$(mktemp -d)` |
| `VERSION` | Version to download | No | `v0.3.1-beta.1` |
| `VERSION` | Version to download | No | `v0.4.0-beta.1` |

[instrument.sh](../instrument.sh) script
uses environment variables as parameters:
Expand All @@ -163,7 +163,7 @@ Example usage:

```powershell
# Download and import the module
$module_url = "https://raw.githubusercontent.com/open-telemetry/opentelemetry-dotnet-instrumentation/v0.3.1-beta.1/OpenTelemetry.DotNet.Auto.psm1"
$module_url = "https://raw.githubusercontent.com/open-telemetry/opentelemetry-dotnet-instrumentation/v0.4.0-beta.1/OpenTelemetry.DotNet.Auto.psm1"
$download_path = Join-Path $env:temp "OpenTelemetry.DotNet.Auto.psm1"
Invoke-WebRequest -Uri $module_url -OutFile $download_path
Import-Module $download_path
Expand Down
4 changes: 2 additions & 2 deletions docs/releasing.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
1. Stable release only! Update `PublicAPI.Shipped.txt` based on corresponding `PublicAPI.Unshipped.txt`.

1. Create a pull request on GitHub with the changes described in the changelog.
- `*scripts*` and `validate-documentation` jobs will fail
because the release is not published yet.

1. Run the integration tests with Linux containers on Windows and macOS
(not covered by CI):
Expand Down Expand Up @@ -46,6 +48,4 @@
- Use the [CHANGELOG.md](../CHANGELOG.md) content in the description.
- Add the artifacts from [the `release` GitHub workflow](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/actions/workflows/release.yml).

1. Update version in `install-script` job in [`.github/workflows/ci.yml`](../.github/workflows/ci.yml).

1. Update version under [OpenTelemetry Operator](https://github.com/open-telemetry/opentelemetry-operator/blob/main/autoinstrumentation/dotnet/version.txt).
2 changes: 1 addition & 1 deletion nuget/OpenTelemetry.AutoInstrumentation.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package>
<metadata>
<id>OpenTelemetry.AutoInstrumentation</id>
<version>0.3.1-beta.1</version>
<version>0.4.0-beta.1</version>
<description>OpenTelemetry Auto-Instrumentation</description>
<authors>OpenTelemetry Authors</authors>
<owners>OpenTelemetry Authors</owners>
Expand Down
2 changes: 1 addition & 1 deletion otel-dotnet-auto-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ esac

test -z "$OTEL_DOTNET_AUTO_HOME" && OTEL_DOTNET_AUTO_HOME="$HOME/.otel-dotnet-auto"
test -z "$TMPDIR" && TMPDIR="$(mktemp -d)"
test -z "$VERSION" && VERSION="v0.3.1-beta.1"
test -z "$VERSION" && VERSION="v0.4.0-beta.1"

RELEASES_URL="https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases"
ARCHIVE="opentelemetry-dotnet-instrumentation-$OS_TYPE.zip"
Expand Down
7 changes: 6 additions & 1 deletion run-example.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ trap finish EXIT
# Start the Docker containers
docker-compose -f ./dev/docker-compose.yaml -f ./examples/docker-compose.yaml up -d

# disable console exporters to avoid noise
export OTEL_DOTNET_AUTO_TRACES_CONSOLE_EXPORTER_ENABLED=false
export OTEL_DOTNET_AUTO_METRICS_CONSOLE_EXPORTER_ENABLED=false
export OTEL_DOTNET_AUTO_LOGS_CONSOLE_EXPORTER_ENABLED=false

# instrument and run HTTP server app in background
export OTEL_DOTNET_AUTO_PLUGINS="Examples.AspNetCoreMvc.OtelSdkPlugin, Examples.AspNetCoreMvc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null:Examples.Vendor.Distro.Plugin, Examples.Vendor.Distro, Version=0.0.1.0, Culture=neutral, PublicKeyToken=null"
ENABLE_PROFILING=${enableProfiling} OTEL_DOTNET_AUTO_METRICS_ADDITIONAL_SOURCES="MyCompany.MyProduct.MyLibrary" OTEL_SERVICE_NAME="aspnet-server" OTEL_TRACES_EXPORTER=${tracesExporter} OTEL_METRICS_EXPORTER=${metricsExporter} OTEL_DOTNET_AUTO_EXCLUDE_PROCESSES=none ./dev/instrument.sh ASPNETCORE_URLS="http://127.0.0.1:8080/" dotnet ./examples/AspNetCoreMvc/bin/${configuration}/${aspNetAppTargetFramework}/Examples.AspNetCoreMvc.dll &
Expand All @@ -65,7 +70,7 @@ ENABLE_PROFILING=${enableProfiling} OTEL_SERVICE_NAME=${exampleApp} OTEL_TRACES_
# verify if it works
{
echo "Check traces at http://localhost:16686/search"
echo "Check metrics at http://localhost:9090"
echo "Check metrics at http://localhost:8889/metrics"
echo "Press enter to close containers and stop example apps"
read
} 2> /dev/null
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<OutputPath>..\bin\ProfilerResources\</OutputPath>

<!-- NuGet -->
<Version>0.3.1</Version>
<Version>0.4.0</Version>

<!-- Hide warnings for EOL .NET Core targets (e.g. netcoreapp2.0) -->
<CheckEolTargetFramework>false</CheckEolTargetFramework>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ cmake_policy(SET CMP0015 NEW)
# Project definition
# ******************************************************

project("OpenTelemetry.AutoInstrumentation.Native" VERSION 0.3.1)
project("OpenTelemetry.AutoInstrumentation.Native" VERSION 0.4.0)

# ******************************************************
# Environment detection
Expand Down
4 changes: 2 additions & 2 deletions src/OpenTelemetry.AutoInstrumentation.Native/Resource.rc
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "The OpenTelemetry Authors"
VALUE "FileDescription", "OpenTelemetry CLR Profiler"
VALUE "FileVersion", "0.3.1.0"
VALUE "FileVersion", "0.4.0.0"
VALUE "InternalName", "OpenTelemetry.AutoInstrumentation.Native.DLL"
VALUE "LegalCopyright", "Copyright 2021 The OpenTelemetry Authors"
VALUE "OriginalFilename", "OpenTelemetry.AutoInstrumentation.Native.DLL"
VALUE "ProductName", "OpenTelemetry .NET AutoInstrumentation"
VALUE "ProductVersion", "0.3.1"
VALUE "ProductVersion", "0.4.0"
END
END
BLOCK "VarFileInfo"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ const WSTRING opentelemetry_autoinstrumentation_loader_assemblyName = WStr("Open
const WSTRING managed_profiler_name = WStr("OpenTelemetry.AutoInstrumentation");

const WSTRING managed_profiler_full_assembly_version =
WStr("OpenTelemetry.AutoInstrumentation, Version=0.3.1.0, Culture=neutral, PublicKeyToken=null");
WStr("OpenTelemetry.AutoInstrumentation, Version=0.4.0.0, Culture=neutral, PublicKeyToken=null");

const WSTRING managed_profiler_full_assembly_version_strong_name =
WStr("OpenTelemetry.AutoInstrumentation, Version=0.3.1.0, Culture=neutral, PublicKeyToken=c0db600a13f60b51");
WStr("OpenTelemetry.AutoInstrumentation, Version=0.4.0.0, Culture=neutral, PublicKeyToken=c0db600a13f60b51");

const WSTRING nonwindows_nativemethods_type = WStr("OpenTelemetry.AutoInstrumentation.NativeMethods+NonWindows");

Expand Down
2 changes: 1 addition & 1 deletion src/OpenTelemetry.AutoInstrumentation.Native/version.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#pragma once

constexpr auto PROFILER_VERSION = "0.3.1";
constexpr auto PROFILER_VERSION = "0.4.0";
2 changes: 1 addition & 1 deletion src/OpenTelemetry.AutoInstrumentation/Constants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ internal static class Constants
{
public static class Tracer
{
public const string Version = "0.3.1";
public const string Version = "0.4.0";
public const string AutoInstrumentationVersionName = "telemetry.auto.version";
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\CommonExcludedAssets.props" />

<PropertyGroup>
<Version>0.3.1</Version>
<Version>0.4.0</Version>
</PropertyGroup>

<ItemGroup>
Expand Down

0 comments on commit d02b9cc

Please sign in to comment.