-
Notifications
You must be signed in to change notification settings - Fork 296
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into yunl/tableMappings6
- Loading branch information
Showing
61 changed files
with
4,103 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
--- | ||
name: OpenTelemetry.Exporter.Instana | ||
about: Issue with OpenTelemetry.Exporter.Instana | ||
labels: comp:exporter.instana | ||
--- | ||
|
||
# Issue with OpenTelemetry.Exporter.Instana | ||
|
||
List of [all OpenTelemetry NuGet | ||
packages](https://www.nuget.org/profiles/OpenTelemetry) and version that you are | ||
using (e.g. `OpenTelemetry 1.0.2`): | ||
|
||
* TBD | ||
|
||
Runtime version (e.g. `net462`, `net48`, `netcoreapp3.1`, `net6.0` etc. You can | ||
find this information from the `*.csproj` file): | ||
|
||
* TBD | ||
|
||
**Is this a feature request or a bug?** | ||
|
||
* [ ] Feature Request | ||
* [ ] Bug | ||
|
||
**What is the expected behavior?** | ||
|
||
What do you expect to see? | ||
|
||
**What is the actual behavior?** | ||
|
||
What did you see instead? If you are reporting a bug, create a self-contained | ||
project using the template of your choice and apply the minimum required code to | ||
result in the issue you're observing. We will close this issue if: | ||
|
||
* The repro project you share with us is complex. We can't investigate custom | ||
projects, so don't point us to such, please. | ||
* If we can not reproduce the behavior you're reporting. | ||
|
||
## Additional Context | ||
|
||
Add any other context about the feature request here. |
41 changes: 41 additions & 0 deletions
41
.github/ISSUE_TEMPLATE/comp_instrumentation_stackexchangeredis.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
--- | ||
name: OpenTelemetry.Instrumentation.StackExchangeRedis | ||
about: Issue with OpenTelemetry.Instrumentation.StackExchangeRedis | ||
labels: comp:instrumentation.stackexchangeredis | ||
--- | ||
|
||
# Issue with OpenTelemetry.Instrumentation.StackExchangeRedis | ||
|
||
List of [all OpenTelemetry NuGet | ||
packages](https://www.nuget.org/profiles/OpenTelemetry) and version that you are | ||
using (e.g. `OpenTelemetry 1.2.0`): | ||
|
||
* TBD | ||
|
||
Runtime version (e.g. `net462`, `net48`, `netcoreapp3.1`, `net6.0` etc. You can | ||
find this information from the `*.csproj` file): | ||
|
||
* TBD | ||
|
||
**Is this a feature request or a bug?** | ||
|
||
* [ ] Feature Request | ||
* [ ] Bug | ||
|
||
**What is the expected behavior?** | ||
|
||
What do you expect to see? | ||
|
||
**What is the actual behavior?** | ||
|
||
What did you see instead? If you are reporting a bug, create a self-contained | ||
project using the template of your choice and apply the minimum required code to | ||
result in the issue you're observing. We will close this issue if: | ||
|
||
* The repro project you share with us is complex. We can't investigate custom | ||
projects, so don't point us to such, please. | ||
* If we can not reproduce the behavior you're reporting. | ||
|
||
## Additional Context | ||
|
||
Add any other context about the feature request here. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
name: Pack OpenTelemetry.Exporter.Instana | ||
|
||
on: | ||
workflow_dispatch: | ||
inputs: | ||
logLevel: | ||
description: 'Log level' | ||
required: true | ||
default: 'warning' | ||
push: | ||
tags: | ||
- 'Exporter.Instana-*' # trigger when we create a tag with prefix "Exporter.Instana-" | ||
|
||
jobs: | ||
build-test-pack: | ||
runs-on: ${{ matrix.os }} | ||
env: | ||
PROJECT: OpenTelemetry.Exporter.Instana | ||
|
||
strategy: | ||
matrix: | ||
os: [windows-latest] | ||
|
||
steps: | ||
- uses: actions/checkout@v3 | ||
with: | ||
fetch-depth: 0 # fetching all | ||
|
||
- name: Install dependencies | ||
run: dotnet restore | ||
|
||
- name: dotnet build ${{env.PROJECT}} | ||
run: dotnet build src/${{env.PROJECT}} --configuration Release --no-restore -p:Deterministic=true | ||
|
||
- name: dotnet test ${{env.PROJECT}} | ||
run: dotnet test test/${{env.PROJECT}}.Tests | ||
|
||
- name: dotnet pack ${{env.PROJECT}} | ||
run: dotnet pack src/${{env.PROJECT}} --configuration Release --no-build | ||
|
||
- name: Publish Artifacts | ||
uses: actions/upload-artifact@v3 | ||
with: | ||
name: ${{env.PROJECT}}-packages | ||
path: '**/${{env.PROJECT}}/bin/**/*.*nupkg' | ||
|
||
- name: Publish Nuget | ||
run: | | ||
nuget push **/${{env.PROJECT}}/bin/**/*.nupkg -Source https://api.nuget.org/v3/index.json -ApiKey ${{ secrets.NUGET_TOKEN }} -SymbolApiKey ${{ secrets.NUGET_TOKEN }} |
49 changes: 49 additions & 0 deletions
49
.github/workflows/package-Instrumentation.StackExchangeRedis.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
name: Pack OpenTelemetry.Instrumentation.StackExchangeRedis | ||
|
||
on: | ||
workflow_dispatch: | ||
inputs: | ||
logLevel: | ||
description: 'Log level' | ||
required: true | ||
default: 'warning' | ||
push: | ||
tags: | ||
- 'Instrumentation.StackExchangeRedis-*' | ||
|
||
jobs: | ||
build-test-pack: | ||
runs-on: ${{ matrix.os }} | ||
env: | ||
PROJECT: OpenTelemetry.Instrumentation.StackExchangeRedis | ||
|
||
strategy: | ||
matrix: | ||
os: [windows-latest] | ||
|
||
steps: | ||
- uses: actions/checkout@v3 | ||
with: | ||
fetch-depth: 0 # fetching all | ||
|
||
- name: Install dependencies | ||
run: dotnet restore | ||
|
||
- name: dotnet build ${{env.PROJECT}} | ||
run: dotnet build src/${{env.PROJECT}} --configuration Release --no-restore -p:Deterministic=true | ||
|
||
- name: dotnet test ${{env.PROJECT}} | ||
run: dotnet test test/${{env.PROJECT}}.Tests | ||
|
||
- name: dotnet pack ${{env.PROJECT}} | ||
run: dotnet pack src/${{env.PROJECT}} --configuration Release --no-build | ||
|
||
- name: Publish Artifacts | ||
uses: actions/upload-artifact@v3 | ||
with: | ||
name: ${{env.PROJECT}}-packages | ||
path: '**/${{env.PROJECT}}/bin/**/*.*nupkg' | ||
|
||
- name: Publish Nuget | ||
run: | | ||
nuget push **/${{env.PROJECT}}/bin/**/*.nupkg -Source https://api.nuget.org/v3/index.json -ApiKey ${{ secrets.NUGET_TOKEN }} -SymbolApiKey ${{ secrets.NUGET_TOKEN }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
src/OpenTelemetry.Contrib.Shared/ServiceProviderExtensions.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
// <copyright file="ServiceProviderExtensions.cs" company="OpenTelemetry Authors"> | ||
// Copyright The OpenTelemetry Authors | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
// </copyright> | ||
|
||
#if NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER || NETCOREAPP3_1_OR_GREATER | ||
using Microsoft.Extensions.Options; | ||
#endif | ||
|
||
namespace System | ||
{ | ||
/// <summary> | ||
/// Extension methods for OpenTelemetry dependency injection support. | ||
/// </summary> | ||
internal static class ServiceProviderExtensions | ||
{ | ||
/// <summary> | ||
/// Get options from the supplied <see cref="IServiceProvider"/>. | ||
/// </summary> | ||
/// <typeparam name="T">Options type.</typeparam> | ||
/// <param name="serviceProvider"><see cref="IServiceProvider"/>.</param> | ||
/// <returns>Options instance.</returns> | ||
public static T GetOptions<T>(this IServiceProvider serviceProvider) | ||
where T : class, new() | ||
{ | ||
#if NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER || NETCOREAPP3_1_OR_GREATER | ||
IOptions<T> options = (IOptions<T>)serviceProvider.GetService(typeof(IOptions<T>)); | ||
|
||
// Note: options could be null if user never invoked services.AddOptions(). | ||
return options?.Value ?? new T(); | ||
#else | ||
return new T(); | ||
#endif | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
# Changelog | ||
|
||
## Unreleased | ||
|
||
## 1.0.0 [2022-May-24] | ||
|
||
This is the first release of the `OpenTelemetry.Exporter.Instana` | ||
project. |
28 changes: 28 additions & 0 deletions
28
src/OpenTelemetry.Exporter.Instana/IInstanaExporterHelper.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
// <copyright file="IInstanaExporterHelper.cs" company="OpenTelemetry Authors"> | ||
// Copyright The OpenTelemetry Authors | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
// </copyright> | ||
|
||
using System.Diagnostics; | ||
using OpenTelemetry.Resources; | ||
|
||
namespace OpenTelemetry.Exporter.Instana | ||
{ | ||
internal interface IInstanaExporterHelper | ||
{ | ||
bool IsWindows(); | ||
|
||
Resource GetParentProviderResource(BaseExporter<Activity> otelExporter); | ||
} | ||
} |
Oops, something went wrong.