Skip to content

Commit dee66ac

Browse files
KielekKielek
authored
Merge branch 'main' into ObservedTimeStamp
2 parents 1091bf0 + 93baea9 commit dee66ac

File tree

30 files changed

+510
-117
lines changed

30 files changed

+510
-117
lines changed

‎.github/workflows/Component.BuildTest.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
run: dotnet-coverage merge -f cobertura -o ./TestResults/Cobertura.xml ./TestResults/**/*.coverage
106106

107107
- name: Upload code coverage ${{ inputs.code-cov-prefix }}-${{ inputs.code-cov-name }}
108-
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
108+
uses: codecov/codecov-action@1af58845a975a7985b0beb0cbe6fbbb71a41dbad # v5.5.3
109109
continue-on-error: true # Note: Don't fail for upload failures
110110
env:
111111
OS: ${{ matrix.os }}
@@ -120,7 +120,7 @@ jobs:
120120

121121
- name: Upload test results ${{ inputs.code-cov-prefix }}-${{ inputs.code-cov-name }}
122122
if: ${{ !cancelled() && hashFiles('./**/TestResults/junit.xml') != '' }}
123-
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
123+
uses: codecov/codecov-action@1af58845a975a7985b0beb0cbe6fbbb71a41dbad # v5.5.3
124124
with:
125125
env_vars: OS,TFM
126126
flags: ${{ inputs.code-cov-prefix }}-${{ inputs.code-cov-name }}

‎.github/workflows/codeql-analysis-steps.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ jobs:
3535
show-progress: false
3636

3737
- name: Initialize CodeQL
38-
uses: github/codeql-action/init@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
38+
uses: github/codeql-action/init@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0
3939
with:
4040
build-mode: none
4141
languages: ${{ matrix.language }}
4242

4343
- name: Perform CodeQL Analysis
44-
uses: github/codeql-action/analyze@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
44+
uses: github/codeql-action/analyze@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0
4545
with:
4646
category: '/language:${{ matrix.language }}'
4747

‎.github/workflows/ossf-scorecard.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ jobs:
4343
# Upload the results to GitHub's code scanning dashboard (optional).
4444
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
4545
- name: "Upload to code-scanning"
46-
uses: github/codeql-action/upload-sarif@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
46+
uses: github/codeql-action/upload-sarif@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0
4747
with:
4848
sarif_file: results.sarif

‎.github/workflows/publish-packages-1.0.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
# renovate: datasource=nuget depName=dotnet-validate
9797
DOTNET_VALIDATE_VERSION: '0.0.1-preview.582'
9898
# renovate: datasource=nuget depName=Meziantou.Framework.NuGetPackageValidation.Tool
99-
MEZIANTOU_VALIDATE_NUGET_PACKAGE_VERSION: '1.0.44'
99+
MEZIANTOU_VALIDATE_NUGET_PACKAGE_VERSION: '1.0.45'
100100
run: |
101101
dotnet tool install --global dotnet-validate --version ${env:DOTNET_VALIDATE_VERSION} --allow-roll-forward
102102
dotnet tool install --global Meziantou.Framework.NuGetPackageValidation.Tool --version ${env:MEZIANTOU_VALIDATE_NUGET_PACKAGE_VERSION} --allow-roll-forward

‎examples/AspNetCore/docker-compose.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ services:
33
# OTEL Collector to receive logs, metrics and traces from the application
44
# plus a UI to query logs, traces and metrics and visualize them.
55
otel-lgtm:
6-
image: grafana/otel-lgtm:0.20.0@sha256:d3683fa0629ad8c8ab20230657637600aeb42141975e635bab3299b28e5a49c0
6+
image: grafana/otel-lgtm:0.21.0@sha256:ab627177ef1c209f4e17261401bb6649477de739a17e69a23a419b8d91d03b2f
77

88
ports:
99
- 3000:3000 # UI

‎examples/Console/Examples.Console.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
<ItemGroup>
2727
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.Console\OpenTelemetry.Exporter.Console.csproj" />
2828
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.OpenTelemetryProtocol\OpenTelemetry.Exporter.OpenTelemetryProtocol.csproj" />
29-
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Shims.OpenTracing\OpenTelemetry.Shims.OpenTracing.csproj" />
3029
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.InMemory\OpenTelemetry.Exporter.InMemory.csproj" />
3130
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.Prometheus.HttpListener\OpenTelemetry.Exporter.Prometheus.HttpListener.csproj" />
3231
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry\OpenTelemetry.csproj" />

‎examples/Console/Program.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ internal static class Program
2929
/// </summary>
3030
/// <param name="args">Arguments from command line.</param>
3131
public static void Main(string[] args) =>
32-
Parser.Default.ParseArguments<PrometheusOptions, MetricsOptions, LogsOptions, GrpcNetClientOptions, HttpClientOptions, ConsoleOptions, OpenTelemetryShimOptions, OpenTracingShimOptions, OtlpOptions, InMemoryOptions>(args)
32+
Parser.Default.ParseArguments<PrometheusOptions, MetricsOptions, LogsOptions, GrpcNetClientOptions, HttpClientOptions, ConsoleOptions, OpenTelemetryShimOptions, OtlpOptions, InMemoryOptions>(args)
3333
.MapResult(
3434
(PrometheusOptions options) => TestPrometheusExporter.Run(options),
3535
(MetricsOptions options) => TestMetrics.Run(options),
@@ -38,7 +38,6 @@ public static void Main(string[] args) =>
3838
(HttpClientOptions options) => TestHttpClient.Run(options),
3939
(ConsoleOptions options) => TestConsoleExporter.Run(),
4040
(OpenTelemetryShimOptions options) => TestOTelShimWithConsoleExporter.Run(),
41-
(OpenTracingShimOptions options) => TestOpenTracingShim.Run(),
4241
(OtlpOptions options) => TestOtlpExporter.Run(options),
4342
(InMemoryOptions options) => TestInMemoryExporter.Run(),
4443
_ => 1);
@@ -93,9 +92,6 @@ internal sealed class ConsoleOptions;
9392
[Verb("otelshim", HelpText = "Specify the options required to test OpenTelemetry Shim with console exporter")]
9493
internal sealed class OpenTelemetryShimOptions;
9594

96-
[Verb("opentracing", HelpText = "Specify the options required to test OpenTracing Shim with console exporter")]
97-
internal sealed class OpenTracingShimOptions;
98-
9995
[Verb("otlp", HelpText = "Specify the options required to test OpenTelemetry Protocol (OTLP)")]
10096
internal sealed class OtlpOptions
10197
{

‎examples/Console/TestOpenTracingShim.cs‎

Lines changed: 0 additions & 57 deletions
This file was deleted.

‎examples/FSharp/docker-compose.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ services:
33
# OTEL Collector to receive logs, metrics and traces from the application
44
# plus a UI to query logs, traces and metrics and visualize them.
55
otel-lgtm:
6-
image: grafana/otel-lgtm:0.20.0@sha256:d3683fa0629ad8c8ab20230657637600aeb42141975e635bab3299b28e5a49c0
6+
image: grafana/otel-lgtm:0.21.0@sha256:ab627177ef1c209f4e17261401bb6649477de739a17e69a23a419b8d91d03b2f
77

88
ports:
99
- 3000:3000 # UI

‎examples/MicroserviceExample/WebApi/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG SDK_VERSION=10.0
2-
FROM mcr.microsoft.com/dotnet/sdk:8.0.419@sha256:9e9690cacf04e7e37722dfd0c93ad99129df850db79c2947704be0752f3e62ac AS dotnet-sdk-8.0
3-
FROM mcr.microsoft.com/dotnet/sdk:9.0.312@sha256:6416205d95f47e66d4292310710f7d738a4ad8f499c8d2370cf22d29a3c7d4b3 AS dotnet-sdk-9.0
2+
FROM mcr.microsoft.com/dotnet/sdk:8.0.419@sha256:a9330090b730c2abde8f3f43b3d1e24e4b8cba028de7bab1a7fdcd50cb7a3b7e AS dotnet-sdk-8.0
3+
FROM mcr.microsoft.com/dotnet/sdk:9.0.312@sha256:13bd3b19e637289720c0ac75d08f0aefa6a4dd933b27a61c2289fd3d26330f34 AS dotnet-sdk-9.0
44
FROM mcr.microsoft.com/dotnet/sdk:10.0.201@sha256:478b9038d187e5b5c29bfa8173ded5d29e864b5ad06102a12106380ee01e2e49 AS dotnet-sdk-10.0
55

66
FROM dotnet-sdk-${SDK_VERSION} AS build
@@ -10,8 +10,8 @@ WORKDIR /app
1010
COPY . ./
1111
RUN dotnet publish ./examples/MicroserviceExample/WebApi -c "${PUBLISH_CONFIGURATION}" -f "${PUBLISH_FRAMEWORK}" -o /out -p:IntegrationBuild=true
1212

13-
FROM mcr.microsoft.com/dotnet/aspnet:8.0.25@sha256:c5674b4fea451913485b342435baaf560ff8b24175667093b735aa8dc12afeec AS dotnet-aspnet-8.0
14-
FROM mcr.microsoft.com/dotnet/aspnet:9.0.14@sha256:7e6c1e89b21c6ae239d95993afb108c153246154ff80a0c0c186331ad30b0cd5 AS dotnet-aspnet-9.0
13+
FROM mcr.microsoft.com/dotnet/aspnet:8.0.25@sha256:d4d80bf500f4c8307e5c44bf61eb58aec027da07c4d1c40816846fe5eef3f34d AS dotnet-aspnet-8.0
14+
FROM mcr.microsoft.com/dotnet/aspnet:9.0.14@sha256:3760f76b46d7ec683786c1e653c29b1ef4bc959ef965520b814de555d26e38fe AS dotnet-aspnet-9.0
1515
FROM mcr.microsoft.com/dotnet/aspnet:10.0.5@sha256:a04d1c1d2d26119049494057d80ea6cda25bbd8aef7c444a1fc1ef874fd3955b AS dotnet-aspnet-10.0
1616

1717
FROM dotnet-aspnet-${SDK_VERSION} AS runtime

0 commit comments

Comments
 (0)