Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[repo] Move OpenTelemetry.SemanticConventions project from main repo #1672

Merged
merged 30 commits into from
Apr 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
3ec6459
Reintroduce OpenTelemetry.SemanticConventions project
joegoldman2 Apr 21, 2024
cc1572b
Cleanup generate script
joegoldman2 Apr 21, 2024
0882491
Fix max line length warning
joegoldman2 Apr 21, 2024
b7db123
Fix link in README.md
joegoldman2 Apr 21, 2024
053aae4
Rollback to open-telemetry/opentelemetry-specification v1.13.0
joegoldman2 Apr 21, 2024
ffa9c47
Move to latest spec version
joegoldman2 Apr 23, 2024
d9bd2dd
Merge branch 'main' into fix/1657
joegoldman2 Apr 23, 2024
0ed1d85
Fix TFM
joegoldman2 Apr 23, 2024
dc23981
Addressing feedback from review
joegoldman2 Apr 23, 2024
40ad259
Fix link in README
joegoldman2 Apr 23, 2024
cb87a88
Move PublicAPI.*.txt to .publicApi
joegoldman2 Apr 23, 2024
6993bba
Add changelog file
joegoldman2 Apr 23, 2024
a7ce581
Add CI/infra
joegoldman2 Apr 24, 2024
82f1fd5
Remove prefixes
joegoldman2 Apr 24, 2024
232cc15
Add missing using directive
joegoldman2 Apr 24, 2024
2803ddd
Merge branch 'main' into fix/1657
joegoldman2 Apr 24, 2024
42eabd8
Add missing target
joegoldman2 Apr 24, 2024
f591be6
Add missing files in sln
joegoldman2 Apr 24, 2024
69d1326
Group attributes by the root namespace
joegoldman2 Apr 24, 2024
fffdf41
Move to file-scoped namespace
joegoldman2 Apr 24, 2024
776ebe6
Attempt to skip code coverage steps if no tests are run.
CodeBlanch Apr 24, 2024
11ca969
Move *Attributes.cs to Attributes folder
joegoldman2 Apr 24, 2024
5279d65
Swap file checks for code coverage upload.
CodeBlanch Apr 24, 2024
30e8b48
Merge branch 'fix/1657' of https://github.com/joegoldman2/opentelemet…
CodeBlanch Apr 24, 2024
1555617
Tweak file check.
CodeBlanch Apr 24, 2024
01568a1
Fix warning about recursive option to dotnet-coverage merge being obs…
CodeBlanch Apr 24, 2024
09cafa5
Fix yml in codecov definitions.
CodeBlanch Apr 24, 2024
f5210b7
Update codecov for new flag.
CodeBlanch Apr 24, 2024
906114d
Merge branch 'main' into fix/1657
CodeBlanch Apr 24, 2024
22f9809
Get rid of print_value macro
joegoldman2 Apr 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions .github/ISSUE_TEMPLATE/comp_semanticconventions.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
---
name: OpenTelemetry.SemanticConventions
about: Issue with OpenTelemetry.SemanticConventions
labels: comp:semanticconvention
---

# Issue with OpenTelemetry.SemanticConventions

List of [all OpenTelemetry NuGet
packages](https://www.nuget.org/profiles/OpenTelemetry) and version that you are
using (e.g. `OpenTelemetry 1.3.2`):

* TBD

Runtime version (e.g. `net462`, `net48`, `net6.0`, `net7.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.
7 changes: 6 additions & 1 deletion .github/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ flags:
paths:
- src/OpenTelemetry.Instrumentation.StackExchangeRedis

unittests-Instrumentation.Wcf:
unittests-Instrumentation.Wcf:
carryforward: true
paths:
- src/OpenTelemetry.Instrumentation.Wcf
Expand Down Expand Up @@ -118,3 +118,8 @@ flags:
carryforward: true
paths:
- src/OpenTelemetry.ResourceDetectors.ProcessRuntime

unittests-SemanticConventions:
carryforward: true
paths:
- src/OpenTelemetry.SemanticConventions
4 changes: 3 additions & 1 deletion .github/workflows/Component.BuildTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,11 @@ jobs:
run: dotnet tool install -g dotnet-coverage

- name: Merging test results
run: dotnet-coverage merge -r -f cobertura -o ./TestResults/Cobertura.xml ./TestResults/*.coverage
if: ${{ hashFiles('./TestResults/**/*.coverage') != '' }}
run: dotnet-coverage merge -f cobertura -o ./TestResults/Cobertura.xml ./TestResults/**/*.coverage

- name: Upload code coverage ${{ inputs.code-cov-prefix }}-${{ inputs.code-cov-name }}
if: ${{ hashFiles('./TestResults/Cobertura.xml') != '' }}
uses: codecov/codecov-action@v4
continue-on-error: true # Note: Don't fail for upload failures
env:
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ jobs:
redis: ['*/OpenTelemetry.Instrumentation.StackExchangeRedis*/**', 'examples/redis/**', '!**/*.md']
resourcedetectors: ['*/OpenTelemetry.ResourceDetectors.*/**', '!**/*.md']
runtime: ['*/OpenTelemetry.Instrumentation.Runtime*/**', 'examples/runtime-instrumentation/**', '!**/*.md']
semanticconventions: ['*/OpenTelemetry.SemanticConventions*/**', '!**/*.md']
sqlclient: ['*/OpenTelemetry.Instrumentation.SqlClient*/**', '!**/*.md']
wcf: ['*/OpenTelemetry.Instrumentation.Wcf*/**', 'examples/wcf/**', '!**/*.md']
solution: [
Expand Down Expand Up @@ -70,6 +71,7 @@ jobs:
'!examples/redis/**',
'!*/OpenTelemetry.Instrumentation.Runtime*/**',
'!examples/runtime-instrumentation/**',
'!*/OpenTelemetry.SemanticConventions*/**',
'!*/OpenTelemetry.Instrumentation.Wcf*/**',
'!examples/wcf/**',
'!**/*.md'
Expand Down Expand Up @@ -256,6 +258,17 @@ jobs:
project-name: OpenTelemetry.Instrumentation.Runtime
code-cov-name: Instrumentation.Runtime

build-test-semanticconventions:
needs: detect-changes
if: |
contains(needs.detect-changes.outputs.changes, 'semanticconventions')
|| contains(needs.detect-changes.outputs.changes, 'build')
|| contains(needs.detect-changes.outputs.changes, 'shared')
uses: ./.github/workflows/Component.BuildTest.yml
with:
project-name: OpenTelemetry.SemanticConventions
code-cov-name: SemanticConventions
CodeBlanch marked this conversation as resolved.
Show resolved Hide resolved

build-test-sqlclient:
needs: detect-changes
if: |
Expand Down Expand Up @@ -404,6 +417,7 @@ jobs:
build-test-redis,
build-test-redis-integration,
build-test-runtime,
build-test-semanticconventions,
build-test-sqlclient,
build-test-wcf,
build-test-solution,
Expand Down
21 changes: 21 additions & 0 deletions .github/workflows/package-SemanticConventions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Pack OpenTelemetry.SemanticConventions

on:
workflow_dispatch:
inputs:
logLevel:
description: 'Log level'
required: true
default: 'warning'
push:
tags:
- 'SemanticConventions-*' # trigger when we create a tag with prefix "SemanticConventions-"

jobs:
call-build-test-pack:
permissions:
contents: write
uses: ./.github/workflows/Component.Package.yml
with:
project-name: OpenTelemetry.SemanticConventions
secrets: inherit
29 changes: 29 additions & 0 deletions build/Projects/OpenTelemetry.SemanticConventions.proj
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<Project>

<PropertyGroup>
<RepoRoot>$([System.IO.Directory]::GetParent($(MSBuildThisFileDirectory)).Parent.Parent.FullName)</RepoRoot>
</PropertyGroup>

<ItemGroup>
<SolutionProjects Include="$(RepoRoot)\src\OpenTelemetry.SemanticConventions\OpenTelemetry.SemanticConventions.csproj" />

<PackProjects Include="$(RepoRoot)\src\OpenTelemetry.SemanticConventions\OpenTelemetry.SemanticConventions.csproj" />
</ItemGroup>

<Target Name="Build">
<MSBuild Projects="@(SolutionProjects)" Targets="Build" ContinueOnError="ErrorAndStop" />
</Target>

<Target Name="Restore">
<MSBuild Projects="@(SolutionProjects)" Targets="Restore" ContinueOnError="ErrorAndStop" />
</Target>

<Target Name="Pack">
<MSBuild Projects="@(PackProjects)" Targets="Pack" ContinueOnError="ErrorAndStop" />
</Target>

<Target Name="VSTest">
<MSBuild Projects="@(TestProjects)" Targets="VSTest" ContinueOnError="ErrorAndStop" />
</Target>

</Project>
11 changes: 10 additions & 1 deletion opentelemetry-dotnet-contrib.sln
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31912.275
MinimumVisualStudioVersion = 15.0.26124.0
Expand Down Expand Up @@ -69,6 +69,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
.github\workflows\package-ResourceDetectors.Process.yml = .github\workflows\package-ResourceDetectors.Process.yml
.github\workflows\package-ResourceDetectors.ProcessRuntime.yml = .github\workflows\package-ResourceDetectors.ProcessRuntime.yml
.github\workflows\package-Sampler.AWS.yml = .github\workflows\package-Sampler.AWS.yml
.github\workflows\package-SemanticConventions.yml = .github\workflows\package-SemanticConventions.yml
.github\workflows\sanitycheck.yml = .github\workflows\sanitycheck.yml
.github\workflows\stale.yml = .github\workflows\stale.yml
.github\workflows\verifyaotcompat.yml = .github\workflows\verifyaotcompat.yml
Expand Down Expand Up @@ -331,6 +332,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Projects", "Projects", "{04
build\Projects\OpenTelemetry.ResourceDetectors.Host.proj = build\Projects\OpenTelemetry.ResourceDetectors.Host.proj
build\Projects\OpenTelemetry.ResourceDetectors.Process.proj = build\Projects\OpenTelemetry.ResourceDetectors.Process.proj
build\Projects\OpenTelemetry.ResourceDetectors.ProcessRuntime.proj = build\Projects\OpenTelemetry.ResourceDetectors.ProcessRuntime.proj
build\Projects\OpenTelemetry.SemanticConventions.proj = build\Projects\OpenTelemetry.SemanticConventions.proj
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.ResourceDetectors.ProcessRuntime", "src\OpenTelemetry.ResourceDetectors.ProcessRuntime\OpenTelemetry.ResourceDetectors.ProcessRuntime.csproj", "{95372E82-CA5B-4C61-BD6C-74E6AB1970D4}"
Expand All @@ -351,6 +353,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTelemetry.Instrumentati
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTelemetry.Instrumentation.SqlClient.Tests", "test\OpenTelemetry.Instrumentation.SqlClient.Tests\OpenTelemetry.Instrumentation.SqlClient.Tests.csproj", "{9C996130-74D7-4FB7-8277-2EE6EBA2BFA6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTelemetry.SemanticConventions", "src\OpenTelemetry.SemanticConventions\OpenTelemetry.SemanticConventions.csproj", "{BC1959E3-164E-42AE-AE1C-DE2E3046E27C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -705,6 +709,10 @@ Global
{9C996130-74D7-4FB7-8277-2EE6EBA2BFA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9C996130-74D7-4FB7-8277-2EE6EBA2BFA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9C996130-74D7-4FB7-8277-2EE6EBA2BFA6}.Release|Any CPU.Build.0 = Release|Any CPU
{BC1959E3-164E-42AE-AE1C-DE2E3046E27C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BC1959E3-164E-42AE-AE1C-DE2E3046E27C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BC1959E3-164E-42AE-AE1C-DE2E3046E27C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BC1959E3-164E-42AE-AE1C-DE2E3046E27C}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -810,6 +818,7 @@ Global
{7AD707F9-DC6D-430A-8834-D5DCD517BF6E} = {2097345F-4DD3-477D-BC54-A922F9B2B402}
{737D1A9E-5A1A-4F4F-830B-E98ED100994C} = {22DF5DC0-1290-4E83-A9D8-6BB7DE3B3E63}
{9C996130-74D7-4FB7-8277-2EE6EBA2BFA6} = {2097345F-4DD3-477D-BC54-A922F9B2B402}
{BC1959E3-164E-42AE-AE1C-DE2E3046E27C} = {22DF5DC0-1290-4E83-A9D8-6BB7DE3B3E63}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B0816796-CDB3-47D7-8C3C-946434DE3B66}
Expand Down
Empty file.
Loading
Loading