Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
gregkalapos committed Aug 24, 2022
2 parents 5b1e345 + 04535b6 commit db0dc2f
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 5 deletions.
17 changes: 17 additions & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,23 @@ endif::[]
[[release-notes-1.x]]
=== .NET Agent version 1.x
[[release-notes-1.17.0]]
==== 1.17.0
===== Features
- {pull}1739[#1739] Introduce the `TraceContinuationStrategy` config (issue: {issue}1637[#1637]).
- {pull}1749[#1749] Span Links with Azure ServiceBus (issue: {issue}1638[#1638]).
- {pull}1765[#1765] Improve db granularity (issue: {issue}1664[#1664]).
- {pull}1795[#1795] Add config option `span_stack_trace_min_duration` (issue: {issue}1529[#1529]).
===== Bug fixes
- {pull}1746[#1746] Fix default for the `ApplicationNamespaces` config.
- {pull}1755[#1755] Flow SynchronizationContext across public API calls (issue: {issue}1660[#1660]).
- {pull}1753[#1753] PayloadSender threading improvements (issue: {issue}1571[#1571]).
- {pull}1773[#1773] Include Accept header on APM server info call (caused errors when reading APM Server info) (issue: {issue}1624[#1624]).
- {pull}1781[#1781] Significantly improved the performance of database query parsing (issue: {issue}1763[#1763]).
- {pull}1787[#1787] Fix FillApmServerInfo : Invalid ElasticApm_ApiKey throws Exception (issue: {issue}1735[#1735]).
[[release-notes-1.16.1]]
==== 1.16.1
Expand Down
8 changes: 4 additions & 4 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<!-- Src Directory Build Properties -->
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
<PropertyGroup>
<AssemblyVersion>1.16.1</AssemblyVersion>
<InformationalVersion>1.16.1</InformationalVersion>
<FileVersion>1.16.1</FileVersion>
<VersionPrefix>1.16.1</VersionPrefix>
<AssemblyVersion>1.17.0</AssemblyVersion>
<InformationalVersion>1.17.0</InformationalVersion>
<FileVersion>1.17.0</FileVersion>
<VersionPrefix>1.17.0</VersionPrefix>
<Authors>Elastic and contributors</Authors>
<Copyright>2022 Elasticsearch BV</Copyright>
<PackageProjectUrl>https://github.com/elastic/apm-agent-dotnet</PackageProjectUrl>
Expand Down
2 changes: 1 addition & 1 deletion src/elastic_apm_profiler/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "elastic_apm_profiler"
version = "1.16.1-beta.1"
version = "1.17.0-beta.1"
edition = "2018"
authors = ["Elastic and Contributors"]
description = "Elastic APM .NET agent CLR profiler"
Expand Down

0 comments on commit db0dc2f

Please sign in to comment.