Skip to content

Commit

Permalink
Merge branch 'main' into record-exceptions-option
Browse files Browse the repository at this point in the history
  • Loading branch information
cijothomas authored May 17, 2024
2 parents d8ef9e6 + c6010d7 commit 0d3464a
Show file tree
Hide file tree
Showing 90 changed files with 631 additions and 1,623 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ body:
- OpenTelemetry.ResourceDetectors.Azure
- OpenTelemetry.ResourceDetectors.Container
- OpenTelemetry.ResourceDetectors.Host
- OpenTelemetry.ResourceDetectors.ProcessRuntime
- OpenTelemetry.Resources.Gcp
- OpenTelemetry.Resources.Process
- OpenTelemetry.Resources.ProcessRuntime
- OpenTelemetry.Sampler.AWS
- OpenTelemetry.SemanticConventions
validations:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ body:
- OpenTelemetry.ResourceDetectors.Azure
- OpenTelemetry.ResourceDetectors.Container
- OpenTelemetry.ResourceDetectors.Host
- OpenTelemetry.ResourceDetectors.ProcessRuntime
- OpenTelemetry.Resources.Gcp
- OpenTelemetry.Resources.Process
- OpenTelemetry.Resources.ProcessRuntime
- OpenTelemetry.Sampler.AWS
- OpenTelemetry.SemanticConventions

Expand Down
8 changes: 4 additions & 4 deletions .github/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,15 @@ flags:
paths:
- src/OpenTelemetry.ResourceDetectors.Host

unittests-ResourceDetectors.ProcessRuntime:
unittests-Resources.Process:
carryforward: true
paths:
- src/OpenTelemetry.ResourceDetectors.ProcessRuntime
- src/OpenTelemetry.Resources.Process

unittests-Resources.Process:
unittests-Resources.ProcessRuntime:
carryforward: true
paths:
- src/OpenTelemetry.Resources.Process
- src/OpenTelemetry.Resources.ProcessRuntime

unittests-SemanticConventions:
carryforward: true
Expand Down
8 changes: 4 additions & 4 deletions .github/component_owners.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ components:
src/OpenTelemetry.ResourceDetectors.Host/:
- Kielek
- lachmatt
src/OpenTelemetry.ResourceDetectors.ProcessRuntime/:
src/OpenTelemetry.Resources.Process/:
- Kielek
- lachmatt
src/OpenTelemetry.Resources.Process/:
src/OpenTelemetry.Resources.ProcessRuntime/:
- Kielek
- lachmatt
src/OpenTelemetry.Resources.Gcp/:
Expand Down Expand Up @@ -166,10 +166,10 @@ components:
test/OpenTelemetry.ResourceDetectors.Host.Tests/:
- Kielek
- lachmatt
test/OpenTelemetry.ResourceDetectors.ProcessRuntime.Tests/:
test/OpenTelemetry.Resources.Process.Tests/:
- Kielek
- lachmatt
test/OpenTelemetry.Resources.Process.Tests/:
test/OpenTelemetry.Resources.ProcessRuntime.Tests/:
- Kielek
- lachmatt
test/OpenTelemetry.Resources.Gcp.Tests/:
Expand Down
71 changes: 0 additions & 71 deletions .github/workflows/Component.Package.yml

This file was deleted.

14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
persistentstorage: ['*/OpenTelemetry.PersistentStorage*/**', '!**/*.md']
process: ['*/OpenTelemetry.Instrumentation.Process*/**', 'examples/process-instrumentation/**', '!**/*.md']
processdetector: ['*/OpenTelemetry.Resources.Process/**', '*/OpenTelemetry.Resources.Process.Tests/**', '!**/*.md']
processruntime: ['*/OpenTelemetry.ResourceDetectors.ProcessRuntime/**', '*/OpenTelemetry.ResourceDetectors.ProcessRuntime.Tests/**', '!**/*.md']
processruntime: ['*/OpenTelemetry.Resources.ProcessRuntime/**', '*/OpenTelemetry.Resources.ProcessRuntime.Tests/**', '!**/*.md']
redis: ['*/OpenTelemetry.Instrumentation.StackExchangeRedis*/**', 'examples/redis/**', '!**/*.md']
resourcedetectors: ['*/OpenTelemetry.ResourceDetectors.*/**', '!**/*.md']
runtime: ['*/OpenTelemetry.Instrumentation.Runtime*/**', 'examples/runtime-instrumentation/**', '!**/*.md']
Expand All @@ -57,11 +57,11 @@ jobs:
'!examples/AspNet/**',
'!*/OpenTelemetry.ResourceDetectors.Azure*/**',
'!*/OpenTelemetry.ResourceDetectors.Host*/**',
'!*/OpenTelemetry.ResourceDetectors.ProcessRuntime/**',
'!*/OpenTelemetry.ResourceDetectors.ProcessRuntime.Tests/**',
'!*/OpenTelemetry.Resources.Gcp*/**',
'!*/OpenTelemetry.Resources.Process/**',
'!*/OpenTelemetry.Resources.Process.Tests/**',
'!*/OpenTelemetry.Resources.ProcessRuntime/**',
'!*/OpenTelemetry.Resources.ProcessRuntime.Tests/**',
'!*/OpenTelemetry.Instrumentation.EventCounters*/**',
'!examples/event-counters/**',
'!*/OpenTelemetry.Extensions/**',
Expand Down Expand Up @@ -280,8 +280,8 @@ jobs:
|| contains(needs.detect-changes.outputs.changes, 'shared')
uses: ./.github/workflows/Component.BuildTest.yml
with:
project-name: OpenTelemetry.ResourceDetectors.ProcessRuntime
code-cov-name: ResourceDetectors.ProcessRuntime
project-name: OpenTelemetry.Resources.ProcessRuntime
code-cov-name: Resources.ProcessRuntime

build-test-redis:
needs: detect-changes
Expand Down Expand Up @@ -405,9 +405,9 @@ jobs:
OpenTelemetry.PersistentStorage.FileSystem.Tests.csproj,
OpenTelemetry.ResourceDetectors.Azure.Tests.csproj,
OpenTelemetry.ResourceDetectors.Host.Tests.csproj,
OpenTelemetry.ResourceDetectors.ProcessRuntime.Tests.csproj,
OpenTelemetry.Resources.Gcp.Tests.csproj,
OpenTelemetry.Resources.Process.Tests.csproj
OpenTelemetry.Resources.Process.Tests.csproj,
OpenTelemetry.Resources.ProcessRuntime.Tests.csproj
$failedProjects = @()
Expand Down
19 changes: 0 additions & 19 deletions .github/workflows/package-Exporter.Geneva.yml

This file was deleted.

66 changes: 0 additions & 66 deletions .github/workflows/package-Exporter.InfluxDB.yml

This file was deleted.

66 changes: 0 additions & 66 deletions .github/workflows/package-Exporter.Instana.yml

This file was deleted.

19 changes: 0 additions & 19 deletions .github/workflows/package-Exporter.OneCollector.yml

This file was deleted.

Loading

0 comments on commit 0d3464a

Please sign in to comment.