Skip to content

Commit

Permalink
[Version Bump] 2.43.0
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewlock committed Nov 27, 2023
1 parent ffeb675 commit 38bcefe
Show file tree
Hide file tree
Showing 36 changed files with 49 additions and 49 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Project definition
# ******************************************************

project("Datadog.Linux.ApiWrapper" VERSION 2.43.0)
project("Datadog.Linux.ApiWrapper" VERSION 3.0.0)

# ******************************************************
# Compiler options
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Project definition
# ******************************************************

project("Datadog.Profiler.Native.Linux" VERSION 2.43.0)
project("Datadog.Profiler.Native.Linux" VERSION 3.0.0)

option(RUN_ASAN "Build with Clang Undefined-Behavior Sanitizer" OFF)
option(RUN_UBSAN "Build with Clang Undefined-Behavior Sanitizer" OFF)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ END

// ------- version info -------------------------------------------------------
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,43,0,0
PRODUCTVERSION 2,43,0,0
FILEVERSION 3,0,0,0
PRODUCTVERSION 3,0,0,0
FILEFLAGSMASK VS_FF_PRERELEASE
FILEOS VOS_NT
FILETYPE VFT_DLL
Expand All @@ -74,12 +74,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Datadog"
VALUE "FileDescription", "Continuous Profiler for .NET Applications"
VALUE "FileVersion", "2.43.0.0"
VALUE "FileVersion", "3.0.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", "2.43.0.0"
VALUE "ProductVersion", "3.0.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

#pragma once

constexpr auto PROFILER_VERSION = "2.43.0";
constexpr auto PROFILER_VERSION = "3.0.0";
2 changes: 1 addition & 1 deletion profiler/src/ProfilerEngine/ProductVersion.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<!-- * * * * * * * * * * * INPUTS. Update this section EVERY time the component is shipped/released! * * * * * * * * * * * -->
<PropertyGroup>
<ProductVersion>2.43.0</ProductVersion>
<ProductVersion>3.0.0</ProductVersion>
</PropertyGroup>
<!-- * * * * * * * * * * * END OF INPUTS. * * * * * * * * * * * -->

Expand Down
2 changes: 1 addition & 1 deletion shared/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("Datadog.Trace.ClrProfiler.Native" VERSION 2.43.0)
project("Datadog.Trace.ClrProfiler.Native" VERSION 3.0.0)

# ******************************************************
# Environment detection
Expand Down
8 changes: 4 additions & 4 deletions shared/src/Datadog.Trace.ClrProfiler.Native/Resource.rc
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ VS_VERSION_INFO VERSIONINFO
#else
FILEFLAGS 0x0L
#endif
FILEVERSION 2,43,0,0
PRODUCTVERSION 2,43,0,0
FILEVERSION 3,0,0,0
PRODUCTVERSION 3,0,0,0
FILEOS VOS_NT
FILETYPE VFT_DLL
BEGIN
Expand All @@ -68,12 +68,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Datadog"
VALUE "FileDescription", "Native loader for Datadog .NET APM"
VALUE "FileVersion", "2.43.0.0"
VALUE "FileVersion", "3.0.0.0"
VALUE "InternalName", "Native loader"
VALUE "LegalCopyright", "(c) Datadog 2020-2022"
VALUE "OriginalFilename", "Datadog.Trace.ClrProfiler.Native.dll"
VALUE "ProductName", "Native loader for Datadog .NET APM"
VALUE "ProductVersion", "2.43.0.0"
VALUE "ProductVersion", "3.0.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
4 changes: 2 additions & 2 deletions shared/src/msi-installer/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>datadog-dotnet-apm-2.43.0-$(Platform)</OutputName> <!-- -The regex recognizes this line -->
<OutputName>datadog-dotnet-apm-3.0.0-prerelease-$(Platform)</OutputName> <!-- -The regex recognizes this line -->
<MonitoringHomeDirectory Condition="'$(MonitoringHomeDirectory)' == ''">$(MSBuildThisFileDirectory)..\..\bin\monitoring-home</MonitoringHomeDirectory>
<DefineConstants>InstallerVersion=2.43.0;MonitoringHomeDirectory=$(MonitoringHomeDirectory);</DefineConstants>
<DefineConstants>InstallerVersion=3.0.0;MonitoringHomeDirectory=$(MonitoringHomeDirectory);</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DefineConstants>$(DefineConstants);Debug</DefineConstants>
Expand Down
4 changes: 2 additions & 2 deletions tracer/build/_build/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ partial class Build : NukeBuild
readonly bool IsAlpine = false;

[Parameter("The current version of the source and build")]
readonly string Version = "2.43.0";
readonly string Version = "3.0.0";

[Parameter("Whether the current build version is a prerelease(for packaging purposes)")]
readonly bool IsPrerelease = false;
readonly bool IsPrerelease = true;

[Parameter("The new build version to set")]
readonly string NewVersion;
Expand Down
2 changes: 1 addition & 1 deletion tracer/build/artifacts/dd-dotnet.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

TRACER_VERSION="2.43.0"
TRACER_VERSION="3.0.0"

# Get the directory of the script
DIR=$(dirname "$(readlink -f "$0")")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Datadog.Trace.Bundle" Version="2.42.0" />
<PackageReference Include="Datadog.Trace.Bundle" Version="2.43.0" />
<PackageReference Include="log4net" Version="2.0.12" />
<PackageReference Include="log4net.Ext.Json" Version="2.0.8.3" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Datadog.Trace.Bundle" Version="2.42.0" />
<PackageReference Include="Datadog.Trace.Bundle" Version="2.43.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
<PackageReference Include="NetEscapades.Extensions.Logging.RollingFile" Version="2.5.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Datadog.Trace.Bundle" Version="2.42.0" />
<PackageReference Include="Datadog.Trace.Bundle" Version="2.43.0" />
<PackageReference Include="NLog" Version="4.0.0" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Datadog.Trace.Bundle" Version="2.42.0" />
<PackageReference Include="Datadog.Trace.Bundle" Version="2.43.0" />
<PackageReference Include="NLog" Version="4.5.11" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Datadog.Trace.Bundle" Version="2.42.0" />
<PackageReference Include="Datadog.Trace.Bundle" Version="2.43.0" />
<PackageReference Include="NLog" Version="4.6.7" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Datadog.Trace.Bundle" Version="2.42.0" />
<PackageReference Include="Datadog.Trace.Bundle" Version="2.43.0" />
<PackageReference Include="Serilog" Version="2.9.0" />
<PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
<PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
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=2.42.0
ARG TRACER_VERSION=2.43.0
RUN mkdir -p /var/log/datadog
RUN mkdir -p /opt/datadog
RUN curl -L https://github.com/DataDog/dd-trace-dotnet/releases/download/v${TRACER_VERSION}/datadog-dotnet-apm-${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=2.42.0
ARG TRACER_VERSION=2.43.0
RUN mkdir -p /var/log/datadog
RUN mkdir -p /opt/datadog
RUN curl -L https://github.com/DataDog/dd-trace-dotnet/releases/download/v${TRACER_VERSION}/datadog-dotnet-apm-${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=2.42.0
ARG TRACER_VERSION=2.43.0
RUN mkdir -p /var/log/datadog
RUN mkdir -p /opt/datadog
RUN curl -LO https://github.com/DataDog/dd-trace-dotnet/releases/download/v${TRACER_VERSION}/datadog-dotnet-apm_${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=2.42.0
ARG TRACER_VERSION=2.43.0
ENV DD_TRACER_VERSION=$TRACER_VERSION
ENV ASPNETCORE_URLS=http://*.80

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

<PropertyGroup>
<TargetFrameworks>net461</TargetFrameworks>
<Version>2.43.0</Version>
<Version>3.0.0-prerelease</Version>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
</PropertyGroup>

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

<PropertyGroup>
<Version>2.43.0</Version>
<Version>3.0.0-prerelease</Version>
<Title>Datadog CI Visibility - BenchmarkDotNet</Title>
<Description>BenchmarkDotNet exporter for Datadog CI Visibility</Description>
<Nullable>enable</Nullable>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Version>2.43.0</Version>
<Version>3.0.0-prerelease</Version>
<Title>Datadog APM Auto-instrumentation Assets</Title>
<Description>Auto-instrumentation assets for Datadog APM</Description>
<IncludeBuildOutput>false</IncludeBuildOutput>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<OutputPath>..\bin\ProfilerResources\</OutputPath>

<!-- NuGet -->
<Version>2.43.0</Version>
<Version>3.0.0-prerelease</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 = "Datadog.Trace, Version=2.43.0.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb";
private const string AssemblyName = "Datadog.Trace, Version=3.0.0.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb";
private const string AzureAppServicesKey = "DD_AZURE_APP_SERVICES";
private const string AasCustomTracingKey = "DD_AAS_ENABLE_CUSTOM_TRACING";
private const string AasCustomMetricsKey = "DD_AAS_ENABLE_CUSTOM_METRICS";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Version>2.43.0</Version>
<Version>3.0.0-prerelease</Version>
</PropertyGroup>

<!-- For VS testing purposes only, copy all implementation assemblies to the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<!-- NuGet -->
<Version>2.43.0</Version>
<Version>3.0.0-prerelease</Version>
<Title>Datadog APM - OpenTracing</Title>
<Description>Provides OpenTracing support for Datadog APM</Description>
<PackageTags>$(PackageTags);OpenTracing</PackageTags>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Version>2.43.0</Version>
<Version>3.0.0-prerelease</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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Version>2.43.0</Version>
<Version>3.0.0-prerelease</Version>
<!-- Unconditionally add a prerelease suffix to the package, but keep the rest of the name so we can associate it with the rest of the release -->
<Version>$(Version)-prerelease</Version>
</PropertyGroup>
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>2.43.0</Version>
<Version>3.0.0-prerelease</Version>
<Title>Datadog APM</Title>
<Description>Instrumentation library for Datadog APM.</Description>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
Expand Down
4 changes: 2 additions & 2 deletions tracer/src/Datadog.Trace/TracerConstants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Datadog.Trace
internal static class TracerConstants
{
public const string Language = "dotnet";
public const string AssemblyVersion = "2.43.0.0";
public const string ThreePartVersion = "2.43.0";
public const string AssemblyVersion = "3.0.0.0";
public const string ThreePartVersion = "3.0.0";
}
}
2 changes: 1 addition & 1 deletion tracer/src/Datadog.Tracer.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("Datadog.Tracer.Native" VERSION 2.43.0)
project("Datadog.Tracer.Native" VERSION 3.0.0)

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

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,43,0,0
PRODUCTVERSION 2,43,0,0
FILEVERSION 3,0,0,0
PRODUCTVERSION 3,0,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -68,12 +68,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Datadog, Inc."
VALUE "FileDescription", "Datadog CLR Profiler"
VALUE "FileVersion", "2.43.0.0"
VALUE "FileVersion", "3.0.0.0"
VALUE "InternalName", "Datadog.Tracer.Native.DLL"
VALUE "LegalCopyright", "Copyright 2017 Datadog, Inc."
VALUE "OriginalFilename", "Datadog.Tracer.Native.DLL"
VALUE "ProductName", "Datadog .NET Tracer"
VALUE "ProductVersion", "2.43.0"
VALUE "ProductVersion", "3.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
4 changes: 2 additions & 2 deletions tracer/src/Datadog.Tracer.Native/dd_profiler_constants.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ const shared::WSTRING system_private_corelib_assemblyName = WStr("System.Private
const shared::WSTRING datadog_trace_clrprofiler_managed_loader_assemblyName = WStr("Datadog.Trace.ClrProfiler.Managed.Loader");

const shared::WSTRING managed_profiler_full_assembly_version =
WStr("Datadog.Trace, Version=2.43.0.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb");
WStr("Datadog.Trace, Version=3.0.0.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb");

const shared::WSTRING managed_profiler_name = WStr("Datadog.Trace");

Expand Down Expand Up @@ -132,7 +132,7 @@ const AssemblyProperty managed_profiler_assembly_property = AssemblyProperty(
49, 105, 236, 40, 21, 176, 12, 238, 238, 204, 141, 90, 27, 244, 61, 182, 125, 41, 97, 163,
233, 190, 161, 57, 127, 4, 62, 192, 116, 145, 112, 150, 73, 37, 47, 85, 101, 183, 86, 197},
160, 32772, 1)
.WithVersion(2, 43, 0, 0);
.WithVersion(3, 0, 0, 0);

} // namespace trace

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

constexpr auto PROFILER_VERSION = "2.43.0";
constexpr auto PROFILER_VERSION = "3.0.0";
2 changes: 1 addition & 1 deletion tracer/tools/PipelineMonitor/PipelineMonitor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Datadog.Trace" Version="2.42.0" />
<PackageReference Include="Datadog.Trace" Version="2.43.0" />
</ItemGroup>

</Project>

0 comments on commit 38bcefe

Please sign in to comment.