Skip to content

Commit

Permalink
Merge branch 'main' into baggage-log-record-processor
Browse files Browse the repository at this point in the history
  • Loading branch information
Kielek authored Dec 17, 2024
2 parents 1c70d6f + 6bd743e commit 095e62d
Show file tree
Hide file tree
Showing 38 changed files with 93 additions and 106 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/Component.BuildTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
required: false
type: string
os-list:
default: '[ "windows-latest", "ubuntu-latest" ]'
default: '[ "windows-latest", "ubuntu-22.04" ]'
required: false
type: string
tfm-list:
Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
os: ${{ fromJSON(inputs.os-list) }}
version: ${{ fromJSON(inputs.tfm-list) }}
exclude:
- os: ubuntu-latest
- os: ubuntu-22.04
version: net462
- os: macos-latest
version: net462
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:

- name: Upload code coverage ${{ inputs.code-cov-prefix }}-${{ inputs.code-cov-name }}
if: ${{ inputs.run-tests && hashFiles('./TestResults/Cobertura.xml') != '' }}
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@v5
continue-on-error: true # Note: Don't fail for upload failures
env:
OS: ${{ matrix.os }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/add-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
add-labels-on-issues:
if: github.event_name == 'issues' && !github.event.issue.pull_request

runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: check out code
Expand All @@ -36,7 +36,7 @@ jobs:
add-labels-on-pull-requests:
if: github.event_name == 'pull_request_target'

runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: check out code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/assign-reviewers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
assign:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: Assign Reviewers
steps:
- uses: dyladan/component-owners@main
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
jobs:
resolve-automation:

runs-on: ubuntu-latest
runs-on: ubuntu-22.04

outputs:
enabled: ${{ steps.evaluate.outputs.enabled }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-Exporter.OneCollector-Integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
${{ github.event_name == 'pull_request_target' &&
github.event.pull_request.head.repo.full_name != github.repository &&
'external' || 'internal' }}
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- run: echo ✓

Expand All @@ -28,10 +28,10 @@ jobs:
strategy:
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
matrix:
os: [ windows-latest, ubuntu-latest ]
os: [ windows-latest, ubuntu-22.04 ]
version: [ net462, net8.0 ]
exclude:
- os: ubuntu-latest
- os: ubuntu-22.04
version: net462

runs-on: ${{ matrix.os }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ jobs:
with:
project-name: Component[OpenTelemetry.Resources.Host]
code-cov-name: Resources.Host
os-list: '[ "windows-latest", "ubuntu-latest", "macos-latest" ]'
os-list: '[ "windows-latest", "ubuntu-22.04", "macos-latest" ]'

build-test-resources-operatingsystem:
needs: detect-changes
Expand All @@ -491,7 +491,7 @@ jobs:
with:
project-name: Component[OpenTelemetry.Resources.OperatingSystem]
code-cov-name: Resources.OperatingSystem
os-list: '[ "windows-latest", "ubuntu-latest", "macos-latest" ]'
os-list: '[ "windows-latest", "ubuntu-22.04", "macos-latest" ]'

build-test-resources-process:
needs: detect-changes
Expand Down Expand Up @@ -628,7 +628,7 @@ jobs:
verify-aot-compat
]
if: always() && !cancelled()
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- run: |
if ( ${{ contains(needs.*.result, 'failure') }} == true ); then echo 'build failed ✗'; exit 1; else echo 'build complete ✓'; fi
2 changes: 1 addition & 1 deletion .github/workflows/core-version-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
secrets: inherit

core-version-update:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

needs: automation

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
redis-integration-test:
if: inputs.job == 'all' || inputs.job == 'redis-integration-test'
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand All @@ -23,7 +23,7 @@ jobs:

kafka-integration-test:
if: inputs.job == 'all' || inputs.job == 'kafka-integration-test'
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/markdownlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
run-markdownlint:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: check out code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/post-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
secrets: inherit

post-release:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

needs:
- automation
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/prepare-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
secrets: inherit

prepare-release-pr:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

needs: automation

Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
-gitUserEmail '${{ needs.automation.outputs.email }}'
lock-pr-and-post-notice-to-create-release-tag:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

needs: automation

Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:
-botUserName '${{ needs.automation.outputs.username }}'
create-release-tag-unlock-pr-post-notice:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

needs: automation

Expand Down Expand Up @@ -181,7 +181,7 @@ jobs:
-gitUserEmail '${{ needs.automation.outputs.email }}'
update-changelog-release-dates-on-prepare-pr-post-notice:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

needs: automation

Expand Down Expand Up @@ -221,7 +221,7 @@ jobs:
-gitUserEmail '${{ needs.automation.outputs.email }}'
process-release-request-issue:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

needs: automation

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:
nuget push src\**\*.nupkg -Source https://api.nuget.org/v3/index.json -ApiKey ${{ secrets.NUGET_TOKEN }} -SymbolApiKey ${{ secrets.NUGET_TOKEN }}
post-build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

needs:
- automation
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sanitycheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
run-misspell:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: check out code
Expand All @@ -20,7 +20,7 @@ jobs:
run: ./bin/misspell -error .

run-sanitycheck:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: check out code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
stale:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/stale@v9
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verifyaotcompat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
matrix:
os: [ ubuntu-latest, windows-latest ]
os: [ ubuntu-22.04, windows-latest ]
version: [ net8.0, net9.0 ]

runs-on: ${{ matrix.os }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/yamllint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
run-yamllint:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: check out code
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ A PR is considered to be **ready to merge** when:

Any maintainer can merge PRs once they are **ready to merge** however
maintainers might decide to wait on merging changes until there are more
approvals and/or dicussion, or based on other factors such as release timing and
approvals and/or discussion, or based on other factors such as release timing and
risk to users. For example if a stable release is planned and a new change is
introduced adding public API(s) or behavioral changes it might be held until the
next alpha/beta release.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ repository](https://github.com/open-telemetry/community/blob/main/guides/contrib
* [Piotr Kiełkowicz](https://github.com/Kielek), Splunk

*Find more about the maintainer role in [community
repository](h[ttps://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#maintainer)).*
repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#maintainer).*

### Emeritus

Expand Down
2 changes: 1 addition & 1 deletion src/OpenTelemetry.Exporter.InfluxDB/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ dotnet add package --prerelease OpenTelemetry.Exporter.InfluxDB

### Step 2: Configure OpenTelemetry MeterProvider

* When using the [OpenTelemetry.Extensions.Hosting](https://github.com/open-telemetry/opentelemetry-dotnet/tree/main/src/OpenTelemetry.Extensions.Hosting/README.md)
* When using the [OpenTelemetry.Extensions.Hosting](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/src/OpenTelemetry.Extensions.Hosting/README.md)
package on .NET 6.0+:

```csharp
Expand Down
2 changes: 1 addition & 1 deletion src/OpenTelemetry.Extensions.AWS/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,4 @@ SDK](https://www.nuget.org/packages/OpenTelemetry/).
The AWSXRay extensions include plugin to generate X-Ray format trace-ids and a
propagator to propagate the X-Ray trace header to downstream. For more details,
please refer to the
[README](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/main/src/OpenTelemetry.Contrib.Extensions.AWSXRay/README.md)
[README](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/main/src/OpenTelemetry.Extensions.AWS/README.md)
14 changes: 3 additions & 11 deletions src/OpenTelemetry.Instrumentation.AspNet/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,9 @@ which instruments [ASP.NET](https://docs.microsoft.com/aspnet/overview) and
collect metrics and traces about incoming web requests.

> [!NOTE]
> This component is based on the OpenTelemetry semantic conventions for
[metrics](https://github.com/open-telemetry/opentelemetry-specification/tree/main/specification/metrics/semantic_conventions)
and
[traces](https://github.com/open-telemetry/opentelemetry-specification/tree/main/specification/trace/semantic_conventions).
These conventions are
[Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/document-status.md),
and hence, this package is a [pre-release](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/VERSIONING.md#pre-releases).
Until a [stable
version](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/telemetry-stability.md)
is released, there can be breaking changes. You can track the progress from
[milestones](https://github.com/open-telemetry/opentelemetry-dotnet/milestone/23).
> This package is a [pre-release](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/VERSIONING.md#pre-releases).
Until a [stable version](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/telemetry-stability.md)
is released, there can be breaking changes.

## Steps to enable OpenTelemetry.Instrumentation.AspNet

Expand Down
14 changes: 7 additions & 7 deletions src/OpenTelemetry.Instrumentation.AspNetCore/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ ASP.NET Core instrumentation must be enabled at application startup. This is
typically done in the `ConfigureServices` of your `Startup` class. Both examples
below enables OpenTelemetry by calling `AddOpenTelemetry()` on `IServiceCollection`.
This extension method requires adding the package
[`OpenTelemetry.Extensions.Hosting`](../OpenTelemetry.Extensions.Hosting/README.md)
[`OpenTelemetry.Extensions.Hosting`](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/src/OpenTelemetry.Extensions.Hosting/README.md)
to the application. This ensures instrumentations are disposed when the host
is shutdown.

Expand All @@ -51,7 +51,7 @@ The following example demonstrates adding ASP.NET Core instrumentation with the
extension method `WithTracing()` on `OpenTelemetryBuilder`.
then extension method `AddAspNetCoreInstrumentation()` on `TracerProviderBuilder`
to the application. This example also sets up the Console Exporter,
which requires adding the package [`OpenTelemetry.Exporter.Console`](../OpenTelemetry.Exporter.Console/README.md)
which requires adding the package [`OpenTelemetry.Exporter.Console`](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/src/OpenTelemetry.Exporter.Console/README.md)
to the application.

```csharp
Expand Down Expand Up @@ -97,7 +97,7 @@ The following example demonstrates adding ASP.NET Core instrumentation with the
extension method `WithMetrics()` on `OpenTelemetryBuilder`
then extension method `AddAspNetCoreInstrumentation()` on `MeterProviderBuilder`
to the application. This example also sets up the Console Exporter,
which requires adding the package [`OpenTelemetry.Exporter.Console`](../OpenTelemetry.Exporter.Console/README.md)
which requires adding the package [`OpenTelemetry.Exporter.Console`](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/src/OpenTelemetry.Exporter.Console/README.md)
to the application.

```csharp
Expand Down Expand Up @@ -185,7 +185,7 @@ This instrumentation can be configured to change the default behavior by using

// TODO: This section could be refined.
When used with
[`OpenTelemetry.Extensions.Hosting`](../OpenTelemetry.Extensions.Hosting/README.md),
[`OpenTelemetry.Extensions.Hosting`](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/src/OpenTelemetry.Extensions.Hosting/README.md),
all configurations to `AspNetCoreTraceInstrumentationOptions` can be done in the
`ConfigureServices`
method of you applications `Startup` class as shown below.
Expand Down Expand Up @@ -270,7 +270,7 @@ services.AddOpenTelemetry()
}));
```

[Processor](../../docs/trace/extending-the-sdk/README.md#processor),
[Processor](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/docs/trace/extending-the-sdk/README.md#processor),
is the general extensibility point to add additional properties to any activity.
The `Enrich` option is specific to this instrumentation, and is provided to
get access to `HttpRequest` and `HttpResponse`.
Expand Down Expand Up @@ -365,8 +365,8 @@ This component uses an
[EventSource](https://docs.microsoft.com/dotnet/api/system.diagnostics.tracing.eventsource)
with the name "OpenTelemetry-Instrumentation-AspNetCore" for its internal
logging. Please refer to [SDK
troubleshooting](../OpenTelemetry/README.md#troubleshooting) for instructions on
seeing these internal logs.
troubleshooting](https://github.com/open-telemetry/opentelemetry-dotnet/tree/main/src/OpenTelemetry/README.md#troubleshooting)
for instructions on seeing these internal logs.

## References

Expand Down
4 changes: 2 additions & 2 deletions src/OpenTelemetry.Instrumentation.Cassandra/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public class Program

For an ASP.NET Core application, adding instrumentation is typically done in
the `ConfigureServices` of your `Startup` class. Refer to documentation for
[OpenTelemetry.Instrumentation.AspNetCore](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/src/OpenTelemetry.Instrumentation.AspNetCore/README.md).
[OpenTelemetry.Instrumentation.AspNetCore](../OpenTelemetry.Instrumentation.AspNetCore/README.md).

For an ASP.NET application, adding instrumentation is typically done in the
`Global.asax.cs`. Refer to documentation for [OpenTelemetry.Instrumentation.AspNet](../OpenTelemetry.Instrumentation.AspNet/README.md).
Expand Down Expand Up @@ -101,6 +101,6 @@ var cluster = new Builder()

* [OpenTelemetry Project](https://opentelemetry.io/)

* [OpenTelemetry semantic conventions for database calls](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/database.md)
* [OpenTelemetry semantic conventions for Cassandra](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/database/cassandra.md)

* [Cassandra C# Driver](https://github.com/datastax/csharp-driver)
Loading

0 comments on commit 095e62d

Please sign in to comment.