From 93e12078c9f110c3347c7ef8fa51b3e520189c1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20=C5=81ach?= Date: Fri, 28 Apr 2023 10:04:51 +0200 Subject: [PATCH] Release 1.1.0 (#715) --- Splunk.SignalFx.DotNet.psm1 | 2 +- docs/CHANGELOG.md | 6 ++++++ docs/internal/docker-windows.md | 4 ++-- .../Datadog.Profiler.Native.Linux/CMakeLists.txt | 2 +- .../Datadog.Profiler.Native.Windows/Resource.rc | 8 ++++---- .../Datadog.Profiler.Native/dd_profiler_version.h | 2 +- profiler/src/ProfilerEngine/ProductVersion.props | 2 +- .../Azure.Site.Extension.nuspec | 2 +- .../src/azure-site-extension/applicationHost.xdt | 14 +++++++------- shared/src/azure-site-extension/install.cmd | 2 +- shared/src/msi-installer/WindowsInstaller.wixproj | 4 ++-- tracer/build/_build/Build.cs | 2 +- tracer/samples/ConsoleApp/Alpine3.10.dockerfile | 2 +- tracer/samples/ConsoleApp/Alpine3.9.dockerfile | 2 +- tracer/samples/ConsoleApp/Debian.dockerfile | 2 +- tracer/samples/WindowsContainer/Dockerfile | 2 +- .../Datadog.Monitoring.Distribution.csproj | 2 +- .../Datadog.Trace.AspNet.csproj | 2 +- ...Datadog.Trace.ClrProfiler.Managed.Loader.csproj | 2 +- .../Startup.cs | 2 +- .../CMakeLists.txt | 2 +- .../Datadog.Trace.ClrProfiler.Native/Resource.rc | 8 ++++---- .../dd_profiler_constants.h | 4 ++-- .../src/Datadog.Trace.ClrProfiler.Native/version.h | 2 +- .../Datadog.Trace.MSBuild.csproj | 2 +- .../Datadog.Trace.OpenTracing.csproj | 2 +- tracer/src/Datadog.Trace/Datadog.Trace.csproj | 2 +- tracer/src/Datadog.Trace/Tracer.cs | 2 +- tracer/src/Datadog.Trace/TracerConstants.cs | 2 +- .../src/WindowsInstaller/WindowsInstaller.wixproj | 4 ++-- .../CI/MsTestV2Tests.cs | 2 +- .../CI/NUnitTests.cs | 2 +- .../CI/XUnitTests.cs | 2 +- 33 files changed, 54 insertions(+), 48 deletions(-) diff --git a/Splunk.SignalFx.DotNet.psm1 b/Splunk.SignalFx.DotNet.psm1 index 3a511996e..5f5147108 100644 --- a/Splunk.SignalFx.DotNet.psm1 +++ b/Splunk.SignalFx.DotNet.psm1 @@ -24,7 +24,7 @@ function Reset-IIS() { #> function Install-SignalFxDotnet() { # signalfx-dotnet-tracing github repository API - $release = "1.0.1" + $release = "1.1.0" $api = "https://api.github.com/repos/signalfx/signalfx-dotnet-tracing/releases/tags/v$($release)" # determine OS architecture diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index c3e397472..cc018d9c5 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -17,6 +17,12 @@ and this repository adheres to [Semantic Versioning](https://semver.org/spec/v2. ### Enhancements +## [Release 1.1.0](https://github.com/signalfx/signalfx-dotnet-tracing/releases/tag/v1.1.0) + +### General + +- Add `profiling.data.total.frame.count` attribute when exporting profiling data. + ## [Release 1.0.1](https://github.com/signalfx/signalfx-dotnet-tracing/releases/tag/v1.0.1) ### General diff --git a/docs/internal/docker-windows.md b/docs/internal/docker-windows.md index 4e5e733a0..911ea51d6 100644 --- a/docs/internal/docker-windows.md +++ b/docs/internal/docker-windows.md @@ -6,7 +6,7 @@ Setting up SignalFx Instrumentation for .NET to run in Windows Nano Server Docke FROM mcr.microsoft.com/dotnet/aspnet:6.0-nanoserver-ltsc2022 # Download SignalFx Instrumentation for .NET zip. -ARG TRACER_VERSION=1.0.1 +ARG TRACER_VERSION=1.1.0 ADD https://github.com/signalfx/signalfx-dotnet-tracing/releases/download/v${TRACER_VERSION}/signalfx-dotnet-tracing-${TRACER_VERSION}.zip "C:/signalfx-dotnet-tracing.zip" # Extract zip to C:/signalfx/ @@ -48,7 +48,7 @@ ENV CORECLR_ENABLE_PROFILING=1 \ CORECLR_PROFILER='{B4C89B0F-9908-4F73-9F59-0D77C5A06874}' \ SIGNALFX_ENDPOINT_URL='' \ -ARG TRACER_VERSION=1.0.1 +ARG TRACER_VERSION=1.1.0 # Download and install SignalFx Instrumentation for .NET MSI. # Note: MSI is preferred installation method for Windows to setup profiler at once and reduce manual steps. diff --git a/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/CMakeLists.txt b/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/CMakeLists.txt index 17531e238..73270194e 100644 --- a/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/CMakeLists.txt +++ b/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/CMakeLists.txt @@ -2,7 +2,7 @@ # Project definition # ****************************************************** -project("Datadog.AutoInstrumentation.Profiler.Native.Linux" VERSION 1.0.1) +project("Datadog.AutoInstrumentation.Profiler.Native.Linux" VERSION 1.1.0) option(RUN_ASAN "Build with Clang Undefined-Behavior Sanitizer" OFF) option(RUN_UBSAN "Build with Clang Undefined-Behavior Sanitizer" OFF) diff --git a/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Windows/Resource.rc b/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Windows/Resource.rc index 978f89316..4f98d7ecf 100644 --- a/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Windows/Resource.rc +++ b/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Windows/Resource.rc @@ -62,8 +62,8 @@ END // ------- version info ------------------------------------------------------- VS_VERSION_INFO VERSIONINFO -FILEVERSION 1,0,1,0 -PRODUCTVERSION 1,0,1,0 +FILEVERSION 1,1,0,0 +PRODUCTVERSION 1,1,0,0 FILEFLAGSMASK VS_FF_PRERELEASE FILEOS VOS_NT FILETYPE VFT_DLL @@ -74,12 +74,12 @@ BEGIN BEGIN VALUE "CompanyName", "Datadog" VALUE "FileDescription", "Continuous Profiler for .NET Applications" - VALUE "FileVersion", "1.0.1.0" + VALUE "FileVersion", "1.1.0.0" VALUE "InternalName", "Native Profiler Engine" VALUE "LegalCopyright", "(c) Datadog 2020-2022" VALUE "OriginalFilename", "Datadog.Profiler.Native.dll" VALUE "ProductName", "Continuous Profiler for .NET Applications" - VALUE "ProductVersion", "1.0.1.0" + VALUE "ProductVersion", "1.1.0.0" END END BLOCK "VarFileInfo" diff --git a/profiler/src/ProfilerEngine/Datadog.Profiler.Native/dd_profiler_version.h b/profiler/src/ProfilerEngine/Datadog.Profiler.Native/dd_profiler_version.h index 1f0286154..ec3281fc7 100644 --- a/profiler/src/ProfilerEngine/Datadog.Profiler.Native/dd_profiler_version.h +++ b/profiler/src/ProfilerEngine/Datadog.Profiler.Native/dd_profiler_version.h @@ -3,7 +3,7 @@ #pragma once -constexpr auto PROFILER_VERSION = "1.0.1"; +constexpr auto PROFILER_VERSION = "1.1.0"; // The beta revision is temporary constexpr auto PROFILER_BETA_REVISION = "1"; diff --git a/profiler/src/ProfilerEngine/ProductVersion.props b/profiler/src/ProfilerEngine/ProductVersion.props index 7ba6bb381..045ecdf80 100644 --- a/profiler/src/ProfilerEngine/ProductVersion.props +++ b/profiler/src/ProfilerEngine/ProductVersion.props @@ -6,7 +6,7 @@ - 1.0.1 + 1.1.0 1 diff --git a/shared/src/azure-site-extension/Azure.Site.Extension.nuspec b/shared/src/azure-site-extension/Azure.Site.Extension.nuspec index edea6d48a..77f0e3dc4 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 - 1.0.1.0 + 1.1.0.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 bd5a4d8f8..4bc39c161 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 5f483b4ce..2c8825e84 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\v1.0.1 +SET tracerDir=%siteHome%\signalfx\tracing\v1.1.0 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 8ce9ba75c..228717b01 100644 --- a/shared/src/msi-installer/WindowsInstaller.wixproj +++ b/shared/src/msi-installer/WindowsInstaller.wixproj @@ -17,11 +17,11 @@ obj\$(Configuration)\$(Platform)\ True false - datadog-dotnet-apm-1.0.1-$(Platform) + datadog-dotnet-apm-1.1.0-$(Platform) $(MSBuildThisFileDirectory)..\..\bin\monitoring-home $(MSBuildThisFileDirectory)..\bin\windows-tracer-home $(MSBuildThisFileDirectory)..\bin\DDProf-Deploy - InstallerVersion=1.0.1;MonitoringHomeDirectory=$(MonitoringHomeDirectory);TracerHomeDirectory=$(TracerHomeDirectory);LibDdwafDirectory=$(LibDdwafDirectory);ProfilerHomeDirectory=$(ProfilerHomeDirectory) + InstallerVersion=1.1.0;MonitoringHomeDirectory=$(MonitoringHomeDirectory);TracerHomeDirectory=$(TracerHomeDirectory);LibDdwafDirectory=$(LibDdwafDirectory);ProfilerHomeDirectory=$(ProfilerHomeDirectory) $(DefineConstants);Debug diff --git a/tracer/build/_build/Build.cs b/tracer/build/_build/Build.cs index 3b3e0d36d..93728c992 100644 --- a/tracer/build/_build/Build.cs +++ b/tracer/build/_build/Build.cs @@ -65,7 +65,7 @@ partial class Build : NukeBuild readonly bool IsAlpine = false; [Parameter("The current version of the source and build")] - readonly string Version = "1.0.1"; + readonly string Version = "1.1.0"; [Parameter("Whether the current build version is a prerelease(for packaging purposes)")] readonly bool IsPrerelease = false; diff --git a/tracer/samples/ConsoleApp/Alpine3.10.dockerfile b/tracer/samples/ConsoleApp/Alpine3.10.dockerfile index b1979b3a4..a36244ed3 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=1.0.1 +ARG TRACER_VERSION=1.1.0 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 cdb4a206e..3fe69bd59 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=1.0.1 +ARG TRACER_VERSION=1.1.0 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 7c9a2a465..f29733aeb 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=1.0.1 +ARG TRACER_VERSION=1.1.0 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 3df84cd6c..d342c635c 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=1.0.1 +ARG TRACER_VERSION=1.1.0 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 464bf5bee..8e121a586 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 @@ - 1.0.1 + 1.1.0 $(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 60b51c33f..9ca00a054 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 - 1.0.1 + 1.1.0 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 4f9e8b181..8c91afb7a 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 - 1.0.1 + 1.1.0 false diff --git a/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.cs b/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.cs index d86d50448..a77491d4a 100644 --- a/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.cs +++ b/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.cs @@ -16,7 +16,7 @@ namespace Datadog.Trace.ClrProfiler.Managed.Loader /// public partial class Startup { - private const string AssemblyName = "SignalFx.Tracing, Version=1.0.1.0, Culture=neutral, PublicKeyToken=e43a27c2023d388a"; + private const string AssemblyName = "SignalFx.Tracing, Version=1.1.0.0, Culture=neutral, PublicKeyToken=e43a27c2023d388a"; private const string AzureAppServicesKey = "SIGNALFX_AZURE_APP_SERVICES"; private const string AasCustomTracingKey = "SIGNALFX_AAS_ENABLE_CUSTOM_TRACING"; private const string AasCustomMetricsKey = "SIGNALFX_AAS_ENABLE_CUSTOM_METRICS"; diff --git a/tracer/src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt b/tracer/src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt index 07b83f6ee..5512cfad5 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 1.0.1) +project("SignalFx.Tracing.ClrProfiler.Native" VERSION 1.1.0) # ****************************************************** # Environment detection diff --git a/tracer/src/Datadog.Trace.ClrProfiler.Native/Resource.rc b/tracer/src/Datadog.Trace.ClrProfiler.Native/Resource.rc index 8d85bd970..d3a8c7ef9 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 1,0,1,0 - PRODUCTVERSION 1,0,1,0 + FILEVERSION 1,1,0,0 + PRODUCTVERSION 1,1,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -67,12 +67,12 @@ BEGIN BEGIN VALUE "CompanyName", "SignalFx" VALUE "FileDescription", "SignalFx CLR Profiler" - VALUE "FileVersion", "1.0.1.0" + VALUE "FileVersion", "1.1.0.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", "1.0.1" + VALUE "ProductVersion", "1.1.0" 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 d7581dc5f..9c859e3be 100644 --- a/tracer/src/Datadog.Trace.ClrProfiler.Native/dd_profiler_constants.h +++ b/tracer/src/Datadog.Trace.ClrProfiler.Native/dd_profiler_constants.h @@ -83,7 +83,7 @@ const shared::WSTRING system_private_corelib_assemblyName = WStr("System.Private const shared::WSTRING datadog_trace_clrprofiler_managed_loader_assemblyName = WStr("SignalFx.Tracing.ClrProfiler.Managed.Loader"); const shared::WSTRING managed_profiler_full_assembly_version = - WStr("SignalFx.Tracing, Version=1.0.1.0, Culture=neutral, PublicKeyToken=e43a27c2023d388a"); + WStr("SignalFx.Tracing, Version=1.1.0.0, Culture=neutral, PublicKeyToken=e43a27c2023d388a"); const shared::WSTRING managed_profiler_name = WStr("SignalFx.Tracing"); @@ -121,7 +121,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(1, 0, 1, 0); + .WithVersion(1, 1, 0, 0); } // namespace trace diff --git a/tracer/src/Datadog.Trace.ClrProfiler.Native/version.h b/tracer/src/Datadog.Trace.ClrProfiler.Native/version.h index e0f73e028..b57799740 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 = "1.0.1"; +constexpr auto PROFILER_VERSION = "1.1.0"; diff --git a/tracer/src/Datadog.Trace.MSBuild/Datadog.Trace.MSBuild.csproj b/tracer/src/Datadog.Trace.MSBuild/Datadog.Trace.MSBuild.csproj index 307136fa5..adb735732 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 @@ - 1.0.1 + 1.1.0 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 d26d7c3d2..f3837dd10 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 @@ - 1.0.1 + 1.1.0 SignalFx Tracing OpenTracing Provides OpenTracing support for SignalFx Tracing SignalFx.Tracing.OpenTracing diff --git a/tracer/src/Datadog.Trace/Datadog.Trace.csproj b/tracer/src/Datadog.Trace/Datadog.Trace.csproj index 4807e7b49..4fc0080dd 100644 --- a/tracer/src/Datadog.Trace/Datadog.Trace.csproj +++ b/tracer/src/Datadog.Trace/Datadog.Trace.csproj @@ -2,7 +2,7 @@ - 1.0.1 + 1.1.0 SignalFx .NET Tracing SignalFx .NET Tracing library SignalFx.Tracing diff --git a/tracer/src/Datadog.Trace/Tracer.cs b/tracer/src/Datadog.Trace/Tracer.cs index dd5b34c0b..721d50c87 100644 --- a/tracer/src/Datadog.Trace/Tracer.cs +++ b/tracer/src/Datadog.Trace/Tracer.cs @@ -430,7 +430,7 @@ private static void RegisterGlobalTracer(Tracer instance) return; } - var signalFxOpenTracingAssembly = Assembly.Load(new AssemblyName("SignalFx.Tracing.OpenTracing, Version=1.0.1.0, Culture=neutral, PublicKeyToken=e43a27c2023d388a")); + var signalFxOpenTracingAssembly = Assembly.Load(new AssemblyName("SignalFx.Tracing.OpenTracing, Version=1.1.0.0, Culture=neutral, PublicKeyToken=e43a27c2023d388a")); var openTracingTracerFactoryType = signalFxOpenTracingAssembly.GetType("Datadog.Trace.OpenTracing.OpenTracingTracerFactory"); var methodInfo = openTracingTracerFactoryType.GetMethod("RegisterGlobalTracerIfAbsent"); object[] args = { instance }; diff --git a/tracer/src/Datadog.Trace/TracerConstants.cs b/tracer/src/Datadog.Trace/TracerConstants.cs index 8031f5c3c..20f1d61b7 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 = "1.0.1.0"; + public static readonly string AssemblyVersion = "1.1.0.0"; } } diff --git a/tracer/src/WindowsInstaller/WindowsInstaller.wixproj b/tracer/src/WindowsInstaller/WindowsInstaller.wixproj index 76810b076..86c21acad 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-1.0.1-$(Platform) + signalfx-dotnet-tracing-1.1.0-$(Platform) $(MSBuildThisFileDirectory)..\bin\dd-tracer-home - InstallerVersion=1.0.1;TracerHomeDirectory=$(TracerHomeDirectory) + InstallerVersion=1.1.0;TracerHomeDirectory=$(TracerHomeDirectory) $(DefineConstants);Debug diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/MsTestV2Tests.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/MsTestV2Tests.cs index 64813ae1d..edc963a9d 100644 --- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/MsTestV2Tests.cs +++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/MsTestV2Tests.cs @@ -85,7 +85,7 @@ public void SubmitTraces(string packageVersion) AssertTargetSpanEqual(targetSpan, "signalfx.tracing.library", "dotnet-tracing"); // check the SignalFx library version - AssertTargetSpanEqual(targetSpan, "signalfx.tracing.version", "1.0.1.0"); + AssertTargetSpanEqual(targetSpan, "signalfx.tracing.version", "1.1.0.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 896c45cc0..db14019fb 100644 --- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/NUnitTests.cs +++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/NUnitTests.cs @@ -100,7 +100,7 @@ public void SubmitTraces(string packageVersion) AssertTargetSpanEqual(targetSpan, "signalfx.tracing.library", "dotnet-tracing"); // check the SignalFx library version - AssertTargetSpanEqual(targetSpan, "signalfx.tracing.version", "1.0.1.0"); + AssertTargetSpanEqual(targetSpan, "signalfx.tracing.version", "1.1.0.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 bee5f935c..432a2da56 100644 --- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/XUnitTests.cs +++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/XUnitTests.cs @@ -93,7 +93,7 @@ public void SubmitTraces(string packageVersion) AssertTargetSpanEqual(targetSpan, "signalfx.tracing.library", "dotnet-tracing"); // check the SignalFx library version - AssertTargetSpanEqual(targetSpan, "signalfx.tracing.version", "1.0.1.0"); + AssertTargetSpanEqual(targetSpan, "signalfx.tracing.version", "1.1.0.0"); // checks the origin tag CheckOriginTag(targetSpan);