Skip to content

Commit

Permalink
Release 0.2.2 (#382)
Browse files Browse the repository at this point in the history
* release 0.2.2

* Update docs/CHANGELOG.md

Co-authored-by: Robert Pająk <[email protected]>

* Update docs/CHANGELOG.md

Co-authored-by: Robert Pająk <[email protected]>
  • Loading branch information
Kielek and pellared authored Feb 14, 2022
1 parent 24cc263 commit e444fb1
Show file tree
Hide file tree
Showing 28 changed files with 48 additions and 40 deletions.
12 changes: 10 additions & 2 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,20 @@ and this repository adheres to [Semantic Versioning](https://semver.org/spec/v2.

### General

- The release adds support for automatic runtime metrics.

### Breaking changes

### Enhancements

---

## [Release 0.2.2](https://github.com/signalfx/signalfx-dotnet-tracing/releases/tag/v0.2.2)

### General

- The release adds experimental support for automatic runtime and tracing metrics.

### Enhancements

- Add `SIGNALFX_RUNTIME_METRICS_ENABLED` setting that enables runtime metrics.
- Add `SIGNALFX_REALM` setting to let the instrumentation bypass
the OpenTelemetry Collector and send telemetry directly to Splunk
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package>
<metadata>
<id>SignalFx.NET.Tracing.Azure.Site.Extension</id>
<version>0.2.1.0</version>
<version>0.2.2.0</version>
<title>SignalFx .NET Tracing</title>
<authors>SignalFx</authors>
<icon>icon.png</icon>
Expand Down
14 changes: 7 additions & 7 deletions shared/src/azure-site-extension/applicationHost.xdt
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@
<add name="COMPLUS_LoaderOptimization" value="1" xdt:Locator="Match(name)" xdt:Transform="Insert"/>
<add name="COR_ENABLE_PROFILING" value="1" xdt:Locator="Match(name)" xdt:Transform="Insert"/>
<add name="COR_PROFILER" value="{B4C89B0F-9908-4F73-9F59-0D77C5A06874}" xdt:Locator="Match(name)" xdt:Transform="Insert"/>
<add name="COR_PROFILER_PATH" value="%HOME%\signalfx\tracing\v0.2.1\win-x64\SignalFx.Tracing.ClrProfiler.Native.dll" xdt:Locator="Match(name)" xdt:Transform="Insert"/>
<add name="COR_PROFILER_PATH_32" value="%HOME%\signalfx\tracing\v0.2.1\win-x86\SignalFx.Tracing.ClrProfiler.Native.dll" xdt:Locator="Match(name)" xdt:Transform="Insert"/>
<add name="COR_PROFILER_PATH_64" value="%HOME%\signalfx\tracing\v0.2.1\win-x64\SignalFx.Tracing.ClrProfiler.Native.dll" xdt:Locator="Match(name)" xdt:Transform="Insert"/>
<add name="COR_PROFILER_PATH" value="%HOME%\signalfx\tracing\v0.2.2\win-x64\SignalFx.Tracing.ClrProfiler.Native.dll" xdt:Locator="Match(name)" xdt:Transform="Insert"/>
<add name="COR_PROFILER_PATH_32" value="%HOME%\signalfx\tracing\v0.2.2\win-x86\SignalFx.Tracing.ClrProfiler.Native.dll" xdt:Locator="Match(name)" xdt:Transform="Insert"/>
<add name="COR_PROFILER_PATH_64" value="%HOME%\signalfx\tracing\v0.2.2\win-x64\SignalFx.Tracing.ClrProfiler.Native.dll" xdt:Locator="Match(name)" xdt:Transform="Insert"/>

<add name="CORECLR_ENABLE_PROFILING" value="1" xdt:Locator="Match(name)" xdt:Transform="Insert"/>
<add name="CORECLR_PROFILER" value="{B4C89B0F-9908-4F73-9F59-0D77C5A06874}" xdt:Locator="Match(name)" xdt:Transform="Insert"/>
<add name="CORECLR_PROFILER_PATH_32" value="%HOME%\signalfx\tracing\v0.2.1\win-x86\SignalFx.Tracing.ClrProfiler.Native.dll" xdt:Locator="Match(name)" xdt:Transform="Insert"/>
<add name="CORECLR_PROFILER_PATH_64" value="%HOME%\signalfx\tracing\v0.2.1\win-x64\SignalFx.Tracing.ClrProfiler.Native.dll" xdt:Locator="Match(name)" xdt:Transform="Insert"/>
<add name="CORECLR_PROFILER_PATH_32" value="%HOME%\signalfx\tracing\v0.2.2\win-x86\SignalFx.Tracing.ClrProfiler.Native.dll" xdt:Locator="Match(name)" xdt:Transform="Insert"/>
<add name="CORECLR_PROFILER_PATH_64" value="%HOME%\signalfx\tracing\v0.2.2\win-x64\SignalFx.Tracing.ClrProfiler.Native.dll" xdt:Locator="Match(name)" xdt:Transform="Insert"/>

<add name="SIGNALFX_DOTNET_TRACER_HOME" value="%HOME%\signalfx\tracing\v0.2.1" xdt:Locator="Match(name)" xdt:Transform="Insert"/>
<add name="SIGNALFX_TRACE_LOG_DIRECTORY" value="%HOME%\LogFiles\signalfx\tracing\v0.2.1\" xdt:Locator="Match(name)" xdt:Transform="Insert"/>
<add name="SIGNALFX_DOTNET_TRACER_HOME" value="%HOME%\signalfx\tracing\v0.2.2" xdt:Locator="Match(name)" xdt:Transform="Insert"/>
<add name="SIGNALFX_TRACE_LOG_DIRECTORY" value="%HOME%\LogFiles\signalfx\tracing\v0.2.2\" xdt:Locator="Match(name)" xdt:Transform="Insert"/>
<add name="SIGNALFX_AZURE_APP_SERVICES" value="1" xdt:Locator="Match(name)" xdt:Transform="Insert"/>
<add name="SIGNALFX_PROFILER_EXCLUDE_PROCESSES" value="SnapshotUploader.exe;workerforwarder.exe" xdt:Locator="Match(name)" xdt:Transform="Insert"/>
</environmentVariables>
Expand Down
2 changes: 1 addition & 1 deletion shared/src/azure-site-extension/install.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ echo Extension directory is %extensionBaseDir%
echo Site root directory is %siteHome%

REM Create version specific tracer directory
SET tracerDir=%siteHome%\signalfx\tracing\v0.2.1
SET tracerDir=%siteHome%\signalfx\tracing\v0.2.2
if not exist %tracerDir% mkdir %tracerDir%

REM Copy tracer to version specific directory
Expand Down
2 changes: 1 addition & 1 deletion shared/src/msi-installer/WindowsInstaller.wixproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<MonitoringHomeDirectory Condition="'$(MonitoringHomeDirectory)' == ''">$(MSBuildThisFileDirectory)..\..\bin\monitoring-home</MonitoringHomeDirectory>
<TracerHomeDirectory Condition="'$(TracerHomeDirectory)' == ''">$(MSBuildThisFileDirectory)..\bin\windows-tracer-home</TracerHomeDirectory>
<ProfilerHomeDirectory Condition="'$(ProfilerHomeDirectory)' == ''">$(MSBuildThisFileDirectory)..\bin\DDProf-Deploy</ProfilerHomeDirectory>
<DefineConstants>InstallerVersion=0.2.1;MonitoringHomeDirectory=$(MonitoringHomeDirectory);TracerHomeDirectory=$(TracerHomeDirectory);LibDdwafDirectory=$(LibDdwafDirectory);ProfilerHomeDirectory=$(ProfilerHomeDirectory)</DefineConstants>
<DefineConstants>InstallerVersion=0.2.2;MonitoringHomeDirectory=$(MonitoringHomeDirectory);TracerHomeDirectory=$(TracerHomeDirectory);LibDdwafDirectory=$(LibDdwafDirectory);ProfilerHomeDirectory=$(ProfilerHomeDirectory)</DefineConstants>
<LibDdwafDirectory Condition="'$(LibDdwafDirectory)' == ''">$(LibDdwafDirectory)..\..\packages\libddwaf.1.0.14</LibDdwafDirectory>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
Expand Down
2 changes: 1 addition & 1 deletion tracer/build/_build/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ partial class Build : NukeBuild
readonly bool IsAlpine = false;

[Parameter("The build version. Default is latest")]
readonly string Version = "0.2.1";
readonly string Version = "0.2.2";

[Parameter("Whether the build version is a prerelease(for packaging purposes). Default is latest")]
readonly bool IsPrerelease = false;
Expand Down
2 changes: 1 addition & 1 deletion tracer/samples/ConsoleApp/Alpine3.10.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ COPY --from=build /app/out .

# Set up Datadog APM
RUN apk --no-cache update && apk add curl
ARG TRACER_VERSION=0.2.1
ARG TRACER_VERSION=0.2.2
RUN mkdir -p /var/log/signalfx
RUN mkdir -p /opt/signalfx
RUN curl -L https://github.com/signalfx/signalfx-dotnet-tracing/releases/download/v${TRACER_VERSION}/signalfx-dotnet-tracing-${TRACER_VERSION}-musl.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion tracer/samples/ConsoleApp/Alpine3.9.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ COPY --from=build /app/out .

# Set up Datadog APM
RUN apk --no-cache update && apk add curl
ARG TRACER_VERSION=0.2.1
ARG TRACER_VERSION=0.2.2
RUN mkdir -p /var/log/signalfx
RUN mkdir -p /opt/signalfx
RUN curl -L https://github.com/signalfx/signalfx-dotnet-tracing/releases/download/v${TRACER_VERSION}/signalfx-dotnet-tracing-${TRACER_VERSION}-musl.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion tracer/samples/ConsoleApp/Debian.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ WORKDIR /app
COPY --from=build /app/out .

# Set up Datadog APM
ARG TRACER_VERSION=0.2.1
ARG TRACER_VERSION=0.2.2
RUN mkdir -p /var/log/signalfx
RUN mkdir -p /opt/signalfx
RUN curl -LO https://github.com/signalfx/signalfx-dotnet-tracing/releases/download/v${TRACER_VERSION}/signalfx-dotnet-tracing_${TRACER_VERSION}_amd64.deb
Expand Down
2 changes: 1 addition & 1 deletion tracer/samples/WindowsContainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
FROM mcr.microsoft.com/dotnet/aspnet:5.0-windowsservercore-ltsc2019 AS base
WORKDIR /app

ARG TRACER_VERSION=0.2.1
ARG TRACER_VERSION=0.2.2
ENV SIGNALFX_TRACER_VERSION=$TRACER_VERSION
ENV ASPNETCORE_URLS=http://*.80

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Version>0.2.1</Version>
<Version>0.2.2</Version>
<Version>$(Version)-beta01</Version> <!-- Unconditionally add a beta suffix to the package, but keep the rest of the name so we can associate it with the rest of the release -->
<Title>Datadog APM Auto-instrumentation Assets</Title>
<Description>Auto-instrumentation assets for Datadog APM</Description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFrameworks>net461</TargetFrameworks>
<Version>0.2.1</Version>
<Version>0.2.2</Version>
<AssemblyName>SignalFx.Tracing.AspNet</AssemblyName>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<AssemblyName>SignalFx.Tracing.ClrProfiler.Managed.Loader</AssemblyName>

<!-- NuGet -->
<Version>0.2.1</Version>
<Version>0.2.2</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 @@ -15,7 +15,7 @@ namespace Datadog.Trace.ClrProfiler.Managed.Loader
/// </summary>
public partial class Startup
{
private const string AssemblyName = "SignalFx.Tracing, Version=0.2.1.0, Culture=neutral, PublicKeyToken=e43a27c2023d388a";
private const string AssemblyName = "SignalFx.Tracing, Version=0.2.2.0, Culture=neutral, PublicKeyToken=e43a27c2023d388a";

/// <summary>
/// Initializes static members of the <see cref="Startup"/> class.
Expand Down
2 changes: 1 addition & 1 deletion tracer/src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ cmake_policy(SET CMP0015 NEW)
# Project definition
# ******************************************************

project("SignalFx.Tracing.ClrProfiler.Native" VERSION 0.2.1)
project("SignalFx.Tracing.ClrProfiler.Native" VERSION 0.2.2)

# ******************************************************
# Environment detection
Expand Down
8 changes: 4 additions & 4 deletions tracer/src/Datadog.Trace.ClrProfiler.Native/Resource.rc
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ END
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,2,1,0
PRODUCTVERSION 0,2,1,0
FILEVERSION 0,2,2,0
PRODUCTVERSION 0,2,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -67,12 +67,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "SignalFx"
VALUE "FileDescription", "SignalFx CLR Profiler"
VALUE "FileVersion", "0.2.1.0"
VALUE "FileVersion", "0.2.2.0"
VALUE "InternalName", "SignalFx.Tracing.ClrProfiler.Native.DLL"
VALUE "LegalCopyright", "Copyright (C) 2021-2023"
VALUE "OriginalFilename", "SignalFx.Tracing.ClrProfiler.Native.DLL"
VALUE "ProductName", "SignalFx .NET Tracing"
VALUE "ProductVersion", "0.2.1"
VALUE "ProductVersion", "0.2.2"
END
END
BLOCK "VarFileInfo"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const WSTRING system_private_corelib_assemblyName = WStr("System.Private.CoreLib
const WSTRING datadog_trace_clrprofiler_managed_loader_assemblyName = WStr("SignalFx.Tracing.ClrProfiler.Managed.Loader");

const WSTRING managed_profiler_full_assembly_version =
WStr("SignalFx.Tracing, Version=0.2.1.0, Culture=neutral, PublicKeyToken=e43a27c2023d388a");
WStr("SignalFx.Tracing, Version=0.2.2.0, Culture=neutral, PublicKeyToken=e43a27c2023d388a");

const WSTRING managed_profiler_name = WStr("SignalFx.Tracing");

Expand Down Expand Up @@ -111,7 +111,7 @@ const AssemblyProperty managed_profiler_assembly_property = AssemblyProperty(
123, 102, 42, 57, 219, 122, 95, 191, 59, 10, 120, 157, 167, 170, 1, 81, 183, 182, 51, 111,
204, 130, 205, 122, 20, 157, 247, 246, 102, 245, 57, 108, 141, 233, 44, 166, 68, 215, 162, 209},
160, 32772, 1)
.WithVersion(0, 2, 1, 0);
.WithVersion(0, 2, 2, 0);

} // namespace trace

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

constexpr auto PROFILER_VERSION = "0.2.1";
constexpr auto PROFILER_VERSION = "0.2.2";
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Version>0.2.1</Version>
<Version>0.2.2</Version>
<AssemblyName>SignalFx.Tracing.MSBuild</AssemblyName>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<!-- NuGet -->
<Version>0.2.1</Version>
<Version>0.2.2</Version>
<Title>SignalFx Tracing OpenTracing</Title>
<Description>Provides OpenTracing support for SignalFx Tracing</Description>
<AssemblyName>SignalFx.Tracing.OpenTracing</AssemblyName>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Version>0.2.1</Version>
<Version>0.2.2</Version>
<Title>Datadog APM Auto-instrumentation Runner</Title>
<Copyright>Copyright 2020 Datadog, Inc.</Copyright>
<Description>Auto-instrumentation dotnet global tool for Datadog APM</Description>
Expand Down
2 changes: 1 addition & 1 deletion tracer/src/Datadog.Trace/Datadog.Trace.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<!-- NuGet -->
<Version>0.2.1</Version>
<Version>0.2.2</Version>
<Title>SignalFx .NET Tracing</Title>
<Description>SignalFx .NET Tracing library</Description>
<AssemblyName>SignalFx.Tracing</AssemblyName>
Expand Down
2 changes: 1 addition & 1 deletion tracer/src/Datadog.Trace/TracerConstants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ internal static class TracerConstants
/// </summary>
public const ulong MaxTraceId = 9_223_372_036_854_775_807;

public static readonly string AssemblyVersion = "0.2.1.0";
public static readonly string AssemblyVersion = "0.2.2.0";
}
}
4 changes: 2 additions & 2 deletions tracer/src/WindowsInstaller/WindowsInstaller.wixproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<IntermediateOutputPath>obj\$(Configuration)\$(Platform)\</IntermediateOutputPath>
<SuppressPdbOutput>True</SuppressPdbOutput>
<DefineSolutionProperties>false</DefineSolutionProperties>
<OutputName>signalfx-dotnet-tracing-0.2.1-$(Platform)</OutputName>
<OutputName>signalfx-dotnet-tracing-0.2.2-$(Platform)</OutputName>
<TracerHomeDirectory Condition="'$(TracerHomeDirectory)' == ''">$(MSBuildThisFileDirectory)..\bin\windows-tracer-home</TracerHomeDirectory>
<DefineConstants>InstallerVersion=0.2.1;TracerHomeDirectory=$(TracerHomeDirectory);LibDdwafDirectory=$(LibDdwafDirectory)</DefineConstants>
<DefineConstants>InstallerVersion=0.2.2;TracerHomeDirectory=$(TracerHomeDirectory);LibDdwafDirectory=$(LibDdwafDirectory)</DefineConstants>
<LibDdwafDirectory Condition="'$(LibDdwafDirectory)' == ''">$(LibDdwafDirectory)..\..\packages\libddwaf.1.0.7</LibDdwafDirectory>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public void SubmitTraces(string packageVersion)
AssertTargetSpanEqual(targetSpan, "signalfx.tracing.library", "dotnet-tracing");

// check the SignalFx library version
AssertTargetSpanEqual(targetSpan, "signalfx.tracing.version", "0.2.1.0");
AssertTargetSpanEqual(targetSpan, "signalfx.tracing.version", "0.2.2.0");

// checks the runtime id tag
AssertTargetSpanExists(targetSpan, Tags.RuntimeId);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public void SubmitTraces(string packageVersion)
AssertTargetSpanEqual(targetSpan, "signalfx.tracing.library", "dotnet-tracing");

// check the SignalFx library version
AssertTargetSpanEqual(targetSpan, "signalfx.tracing.version", "0.2.1.0");
AssertTargetSpanEqual(targetSpan, "signalfx.tracing.version", "0.2.2.0");

// checks the runtime id tag
AssertTargetSpanExists(targetSpan, Tags.RuntimeId);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public void SubmitTraces(string packageVersion)
AssertTargetSpanEqual(targetSpan, "signalfx.tracing.library", "dotnet-tracing");

// check the SignalFx library version
AssertTargetSpanEqual(targetSpan, "signalfx.tracing.version", "0.2.1.0");
AssertTargetSpanEqual(targetSpan, "signalfx.tracing.version", "0.2.2.0");

// checks the origin tag
CheckOriginTag(targetSpan);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM mcr.microsoft.com/dotnet/core/runtime:2.1-stretch-slim AS base
ARG TRACER_VERSION=0.2.1
ARG TRACER_VERSION=0.2.2
RUN mkdir -p /opt/signalfx
RUN mkdir -p /var/log/signalfx/dotnet
RUN curl -L https://github.com/signalfx/signalfx-dotnet-tracing/releases/download/v$TRACER_VERSION/signalfx-dotnet-tracing-$TRACER_VERSION.tar.gz | tar xzf - -C /opt/signalfx
Expand Down

0 comments on commit e444fb1

Please sign in to comment.