Merge branch 'main' into xiang17/fixGCHeapSizeAPI

open-telemetry · Jul 19, 2022 · 2af64eb · 2af64eb
2 parents 81b335d + d8ab64a
commit 2af64eb
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 14 deletions.
diff --git a/src/OpenTelemetry.Exporter.Stackdriver/README.md b/src/OpenTelemetry.Exporter.Stackdriver/README.md
@@ -3,22 +3,21 @@
 [![NuGet](https://img.shields.io/nuget/v/OpenTelemetry.Exporter.Stackdriver.svg)](https://www.nuget.org/packages/OpenTelemetry.Exporter.Stackdriver)
 [![NuGet](https://img.shields.io/nuget/dt/OpenTelemetry.Exporter.Stackdriver.svg)](https://www.nuget.org/packages/OpenTelemetry.Exporter.Stackdriver)
 
-**NOTE: This exporter is not affiliated with or officially supported by Google.**
+**NOTE: This exporter is not affiliated with or officially supported by
+Google.**
 
 This sample assumes your code authenticates to Stackdriver APIs using [service
 account][gcp-auth] with credentials stored in environment variable
 GOOGLE_APPLICATION_CREDENTIALS. When you run on [GAE][GAE], [GKE][GKE] or
 locally with gcloud sdk installed - this is typically the case. There is also a
-constructor for specifying path to the service account credential. See
-[sample][stackdriver-sample] for details.
+constructor for specifying path to the service account credential.
 
 1. Add [Stackdriver Exporter
    package][OpenTelemetry-exporter-stackdriver-myget-url] reference.
 2. Enable [Stackdriver Trace][stackdriver-trace-setup] API.
 3. Enable [Stackdriver Monitoring][stackdriver-monitoring-setup] API.
 4. Instantiate a new instance of `StackdriverExporter` with your Google Cloud's
    ProjectId
-5. See [sample][stackdriver-sample] for example use.
 
 ## Installation
 
@@ -64,3 +63,13 @@ metricExporter.Start();
 * [GAE](https://cloud.google.com/appengine/docs/flexible/dotnet/quickstart)
 * [GKE](https://codelabs.developers.google.com/codelabs/cloud-kubernetes-aspnetcore/index.html)
 * [gcp-auth](https://cloud.google.com/docs/authentication/getting-started)
+
+[stackdriver-trace-setup]: https://cloud.google.com/trace/docs/setup/
+[stackdriver-monitoring-setup]:
+    https://cloud.google.com/monitoring/api/enable-api
+[GAE]: https://cloud.google.com/appengine/docs/flexible/dotnet/quickstart
+[GKE]:
+    https://codelabs.developers.google.com/codelabs/cloud-kubernetes-aspnetcore/index.html
+[gcp-auth]: https://cloud.google.com/docs/authentication/getting-started
+[OpenTelemetry-exporter-stackdriver-myget-url]:
+    https://www.nuget.org/packages/OpenTelemetry.Exporter.Stackdriver
diff --git a/src/OpenTelemetry.Instrumentation.MySqlData/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.MySqlData/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Updated OTel SDK package version to 1.3.0
+  ([#508](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/508))
+
 ## 1.0.0-beta.3
 
 Released 2022-Jun-29

diff --git a/src/OpenTelemetry.Instrumentation.MySqlData/OpenTelemetry.Instrumentation.MySqlData.csproj b/src/OpenTelemetry.Instrumentation.MySqlData/OpenTelemetry.Instrumentation.MySqlData.csproj
@@ -8,17 +8,17 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="MySql.Data" Version="6.10.7"/>
-        <PackageReference Include="OpenTelemetry.Api" Version="1.1.0"/>
+        <PackageReference Include="MySql.Data" Version="6.10.7" />
+        <PackageReference Include="OpenTelemetry.Api" Version="$(OpenTelemetryApiPkgVer)" />
     </ItemGroup>
 
     <ItemGroup>
-        <Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\Api\SemanticConventions.cs" Link="Includes\SemanticConventions.cs"/>
-        <Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\Api\IActivityEnumerator.cs" Link="Includes\IActivityEnumerator.cs"/>
-        <Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\Api\ActivityHelperExtensions.cs" Link="Includes\ActivityHelperExtensions.cs"/>
-        <Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\Api\EnumerationHelper.cs" Link="Includes\EnumerationHelper.cs"/>
-        <Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\Api\SpanAttributeConstants.cs" Link="Includes\SpanAttributeConstants.cs"/>
-        <Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\Api\StatusHelper.cs" Link="Includes\StatusHelper.cs"/>
+        <Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\Api\SemanticConventions.cs" Link="Includes\SemanticConventions.cs" />
+        <Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\Api\IActivityEnumerator.cs" Link="Includes\IActivityEnumerator.cs" />
+        <Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\Api\ActivityHelperExtensions.cs" Link="Includes\ActivityHelperExtensions.cs" />
+        <Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\Api\EnumerationHelper.cs" Link="Includes\EnumerationHelper.cs" />
+        <Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\Api\SpanAttributeConstants.cs" Link="Includes\SpanAttributeConstants.cs" />
+        <Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\Api\StatusHelper.cs" Link="Includes\StatusHelper.cs" />
         <Compile Include="$(RepoRoot)\src\OpenTelemetry.Internal\Guard.cs" Link="Includes\Guard.cs" />
     </ItemGroup>
 

diff --git a/...etry.Instrumentation.MySqlData.Tests/OpenTelemetry.Instrumentation.MySqlData.Tests.csproj b/...etry.Instrumentation.MySqlData.Tests/OpenTelemetry.Instrumentation.MySqlData.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>netcoreapp3.1</TargetFramework>
@@ -16,7 +16,7 @@
         </PackageReference>
         <DotNetCliToolReference Include="dotnet-xunit" Version="$(DotNetXUnitCliVer)" />
         <PackageReference Include="MySql.Data" Version="6.10.7" />
-        <PackageReference Include="OpenTelemetry" Version="1.1.0" />
+        <PackageReference Include="OpenTelemetry" Version="$(OpenTelemetryPkgVer)" />
     </ItemGroup>
 
     <ItemGroup>