diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 604da9ef6..d386dea74 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -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 diff --git a/shared/src/azure-site-extension/Azure.Site.Extension.nuspec b/shared/src/azure-site-extension/Azure.Site.Extension.nuspec index b045d0c88..6096171ad 100644 --- a/shared/src/azure-site-extension/Azure.Site.Extension.nuspec +++ b/shared/src/azure-site-extension/Azure.Site.Extension.nuspec @@ -2,7 +2,7 @@ SignalFx.NET.Tracing.Azure.Site.Extension - 0.2.1.0 + 0.2.2.0 SignalFx .NET Tracing SignalFx icon.png diff --git a/shared/src/azure-site-extension/applicationHost.xdt b/shared/src/azure-site-extension/applicationHost.xdt index f228f7e65..ac63e7dfd 100644 --- a/shared/src/azure-site-extension/applicationHost.xdt +++ b/shared/src/azure-site-extension/applicationHost.xdt @@ -25,17 +25,17 @@ - - - + + + - - + + - - + + diff --git a/shared/src/azure-site-extension/install.cmd b/shared/src/azure-site-extension/install.cmd index 4a7528c12..ed8f967e7 100644 --- a/shared/src/azure-site-extension/install.cmd +++ b/shared/src/azure-site-extension/install.cmd @@ -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 diff --git a/shared/src/msi-installer/WindowsInstaller.wixproj b/shared/src/msi-installer/WindowsInstaller.wixproj index f40537fd8..e90a60823 100644 --- a/shared/src/msi-installer/WindowsInstaller.wixproj +++ b/shared/src/msi-installer/WindowsInstaller.wixproj @@ -23,7 +23,7 @@ $(MSBuildThisFileDirectory)..\..\bin\monitoring-home $(MSBuildThisFileDirectory)..\bin\windows-tracer-home $(MSBuildThisFileDirectory)..\bin\DDProf-Deploy - InstallerVersion=0.2.1;MonitoringHomeDirectory=$(MonitoringHomeDirectory);TracerHomeDirectory=$(TracerHomeDirectory);LibDdwafDirectory=$(LibDdwafDirectory);ProfilerHomeDirectory=$(ProfilerHomeDirectory) + InstallerVersion=0.2.2;MonitoringHomeDirectory=$(MonitoringHomeDirectory);TracerHomeDirectory=$(TracerHomeDirectory);LibDdwafDirectory=$(LibDdwafDirectory);ProfilerHomeDirectory=$(ProfilerHomeDirectory) $(LibDdwafDirectory)..\..\packages\libddwaf.1.0.14 diff --git a/tracer/build/_build/Build.cs b/tracer/build/_build/Build.cs index 543f65d42..177f59d60 100644 --- a/tracer/build/_build/Build.cs +++ b/tracer/build/_build/Build.cs @@ -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; diff --git a/tracer/samples/ConsoleApp/Alpine3.10.dockerfile b/tracer/samples/ConsoleApp/Alpine3.10.dockerfile index 306d82673..f9c78054a 100644 --- a/tracer/samples/ConsoleApp/Alpine3.10.dockerfile +++ b/tracer/samples/ConsoleApp/Alpine3.10.dockerfile @@ -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 \ diff --git a/tracer/samples/ConsoleApp/Alpine3.9.dockerfile b/tracer/samples/ConsoleApp/Alpine3.9.dockerfile index 9fa582634..693b9e8b7 100644 --- a/tracer/samples/ConsoleApp/Alpine3.9.dockerfile +++ b/tracer/samples/ConsoleApp/Alpine3.9.dockerfile @@ -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 \ diff --git a/tracer/samples/ConsoleApp/Debian.dockerfile b/tracer/samples/ConsoleApp/Debian.dockerfile index 0c228c9e3..e8eef39d6 100644 --- a/tracer/samples/ConsoleApp/Debian.dockerfile +++ b/tracer/samples/ConsoleApp/Debian.dockerfile @@ -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 diff --git a/tracer/samples/WindowsContainer/Dockerfile b/tracer/samples/WindowsContainer/Dockerfile index 1287ab937..50a7f9293 100644 --- a/tracer/samples/WindowsContainer/Dockerfile +++ b/tracer/samples/WindowsContainer/Dockerfile @@ -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 diff --git a/tracer/src/Datadog.Monitoring.Distribution/Datadog.Monitoring.Distribution.csproj b/tracer/src/Datadog.Monitoring.Distribution/Datadog.Monitoring.Distribution.csproj index ae0f8c2d2..9ab18acf2 100644 --- a/tracer/src/Datadog.Monitoring.Distribution/Datadog.Monitoring.Distribution.csproj +++ b/tracer/src/Datadog.Monitoring.Distribution/Datadog.Monitoring.Distribution.csproj @@ -1,7 +1,7 @@ - 0.2.1 + 0.2.2 $(Version)-beta01 Datadog APM Auto-instrumentation Assets Auto-instrumentation assets for Datadog APM diff --git a/tracer/src/Datadog.Trace.AspNet/Datadog.Trace.AspNet.csproj b/tracer/src/Datadog.Trace.AspNet/Datadog.Trace.AspNet.csproj index 5b09264a8..9cf3e07f9 100644 --- a/tracer/src/Datadog.Trace.AspNet/Datadog.Trace.AspNet.csproj +++ b/tracer/src/Datadog.Trace.AspNet/Datadog.Trace.AspNet.csproj @@ -2,7 +2,7 @@ net461 - 0.2.1 + 0.2.2 SignalFx.Tracing.AspNet false diff --git a/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Datadog.Trace.ClrProfiler.Managed.Loader.csproj b/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Datadog.Trace.ClrProfiler.Managed.Loader.csproj index 5c0b01b2d..584aa545f 100644 --- a/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Datadog.Trace.ClrProfiler.Managed.Loader.csproj +++ b/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Datadog.Trace.ClrProfiler.Managed.Loader.csproj @@ -7,7 +7,7 @@ SignalFx.Tracing.ClrProfiler.Managed.Loader - 0.2.1 + 0.2.2 false diff --git a/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.cs b/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.cs index 745a87446..ac81c1f22 100644 --- a/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.cs +++ b/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.cs @@ -15,7 +15,7 @@ namespace Datadog.Trace.ClrProfiler.Managed.Loader /// 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"; /// /// Initializes static members of the class. diff --git a/tracer/src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt b/tracer/src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt index 5b73d20af..aff33d7d4 100644 --- a/tracer/src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt +++ b/tracer/src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt @@ -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 diff --git a/tracer/src/Datadog.Trace.ClrProfiler.Native/Resource.rc b/tracer/src/Datadog.Trace.ClrProfiler.Native/Resource.rc index a17c9ec85..44758d767 100644 --- a/tracer/src/Datadog.Trace.ClrProfiler.Native/Resource.rc +++ b/tracer/src/Datadog.Trace.ClrProfiler.Native/Resource.rc @@ -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 @@ -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" diff --git a/tracer/src/Datadog.Trace.ClrProfiler.Native/dd_profiler_constants.h b/tracer/src/Datadog.Trace.ClrProfiler.Native/dd_profiler_constants.h index f279d2c8c..d1f32c842 100644 --- a/tracer/src/Datadog.Trace.ClrProfiler.Native/dd_profiler_constants.h +++ b/tracer/src/Datadog.Trace.ClrProfiler.Native/dd_profiler_constants.h @@ -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"); @@ -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 diff --git a/tracer/src/Datadog.Trace.ClrProfiler.Native/version.h b/tracer/src/Datadog.Trace.ClrProfiler.Native/version.h index 1bc445fef..21cd05d68 100644 --- a/tracer/src/Datadog.Trace.ClrProfiler.Native/version.h +++ b/tracer/src/Datadog.Trace.ClrProfiler.Native/version.h @@ -1,3 +1,3 @@ #pragma once -constexpr auto PROFILER_VERSION = "0.2.1"; +constexpr auto PROFILER_VERSION = "0.2.2"; diff --git a/tracer/src/Datadog.Trace.MSBuild/Datadog.Trace.MSBuild.csproj b/tracer/src/Datadog.Trace.MSBuild/Datadog.Trace.MSBuild.csproj index 69b10d7e1..d189182eb 100644 --- a/tracer/src/Datadog.Trace.MSBuild/Datadog.Trace.MSBuild.csproj +++ b/tracer/src/Datadog.Trace.MSBuild/Datadog.Trace.MSBuild.csproj @@ -1,7 +1,7 @@ - 0.2.1 + 0.2.2 SignalFx.Tracing.MSBuild diff --git a/tracer/src/Datadog.Trace.OpenTracing/Datadog.Trace.OpenTracing.csproj b/tracer/src/Datadog.Trace.OpenTracing/Datadog.Trace.OpenTracing.csproj index b4a573d21..9ea60d30f 100644 --- a/tracer/src/Datadog.Trace.OpenTracing/Datadog.Trace.OpenTracing.csproj +++ b/tracer/src/Datadog.Trace.OpenTracing/Datadog.Trace.OpenTracing.csproj @@ -2,7 +2,7 @@ - 0.2.1 + 0.2.2 SignalFx Tracing OpenTracing Provides OpenTracing support for SignalFx Tracing SignalFx.Tracing.OpenTracing diff --git a/tracer/src/Datadog.Trace.Tools.Runner/Datadog.Trace.Tools.Runner.csproj b/tracer/src/Datadog.Trace.Tools.Runner/Datadog.Trace.Tools.Runner.csproj index b6ef8a8e4..48daebafa 100644 --- a/tracer/src/Datadog.Trace.Tools.Runner/Datadog.Trace.Tools.Runner.csproj +++ b/tracer/src/Datadog.Trace.Tools.Runner/Datadog.Trace.Tools.Runner.csproj @@ -1,7 +1,7 @@ - 0.2.1 + 0.2.2 Datadog APM Auto-instrumentation Runner Copyright 2020 Datadog, Inc. Auto-instrumentation dotnet global tool for Datadog APM diff --git a/tracer/src/Datadog.Trace/Datadog.Trace.csproj b/tracer/src/Datadog.Trace/Datadog.Trace.csproj index 598290718..6a2a979e2 100644 --- a/tracer/src/Datadog.Trace/Datadog.Trace.csproj +++ b/tracer/src/Datadog.Trace/Datadog.Trace.csproj @@ -2,7 +2,7 @@ - 0.2.1 + 0.2.2 SignalFx .NET Tracing SignalFx .NET Tracing library SignalFx.Tracing diff --git a/tracer/src/Datadog.Trace/TracerConstants.cs b/tracer/src/Datadog.Trace/TracerConstants.cs index 8162bc597..b014b2688 100644 --- a/tracer/src/Datadog.Trace/TracerConstants.cs +++ b/tracer/src/Datadog.Trace/TracerConstants.cs @@ -17,6 +17,6 @@ internal static class TracerConstants /// 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"; } } diff --git a/tracer/src/WindowsInstaller/WindowsInstaller.wixproj b/tracer/src/WindowsInstaller/WindowsInstaller.wixproj index b25f4de8f..7b8b80a01 100644 --- a/tracer/src/WindowsInstaller/WindowsInstaller.wixproj +++ b/tracer/src/WindowsInstaller/WindowsInstaller.wixproj @@ -17,9 +17,9 @@ obj\$(Configuration)\$(Platform)\ True false - signalfx-dotnet-tracing-0.2.1-$(Platform) + signalfx-dotnet-tracing-0.2.2-$(Platform) $(MSBuildThisFileDirectory)..\bin\windows-tracer-home - InstallerVersion=0.2.1;TracerHomeDirectory=$(TracerHomeDirectory);LibDdwafDirectory=$(LibDdwafDirectory) + InstallerVersion=0.2.2;TracerHomeDirectory=$(TracerHomeDirectory);LibDdwafDirectory=$(LibDdwafDirectory) $(LibDdwafDirectory)..\..\packages\libddwaf.1.0.7 diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/MsTestV2Tests.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/MsTestV2Tests.cs index 6eebddae4..74391139e 100644 --- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/MsTestV2Tests.cs +++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/MsTestV2Tests.cs @@ -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); diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/NUnitTests.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/NUnitTests.cs index a442a79f1..c96ef6197 100644 --- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/NUnitTests.cs +++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/NUnitTests.cs @@ -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); diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/XUnitTests.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/XUnitTests.cs index be1fa73dd..b7c252df5 100644 --- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/XUnitTests.cs +++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/XUnitTests.cs @@ -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); diff --git a/tracer/test/test-applications/regression/AutomapperTest/Dockerfile b/tracer/test/test-applications/regression/AutomapperTest/Dockerfile index 4435fed0c..9fcc621a7 100644 --- a/tracer/test/test-applications/regression/AutomapperTest/Dockerfile +++ b/tracer/test/test-applications/regression/AutomapperTest/Dockerfile @@ -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