Skip to content

Commit a6a9f7f

Browse files
authored
Upgrade AWS dependency to latest version and remove .NET 6 examples/CI (grafana#127)
* Remove .NET6 from solution and CI * Upgrade AWS instrumentation packages
1 parent 853d646 commit a6a9f7f

24 files changed

+27
-419
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ used, for example `Grafana.OpenTelemetry 0.6.0-beta.1`):
1212

1313
*
1414

15-
The .NET runtime version (e.g. `net462`, `net48`, `netcoreapp3.1`, `net6.0`
15+
The .NET runtime version (e.g. `net462`, `net48`, `netcoreapp3.1`, `net8.0`
1616
etc.). You can find this information in your `*.csproj` file):
1717

18-
*
18+
*
1919

2020
## Symptom
2121

.github/workflows/unit-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
1717
matrix:
1818
os: [ windows-latest, ubuntu-latest ]
19-
version: [ net462, net6.0, net8.0 ]
19+
version: [ net462, net8.0 ]
2020
exclude:
2121
- os: ubuntu-latest
2222
version: net462

CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# Changelog
22

3+
## Unreleased
4+
5+
### BREAKING CHANGES
6+
7+
* Drop support for .NET 6. EOL was November 12 2024
8+
9+
### New features
10+
11+
* Use 1.10.0-beta.1 of OpenTelemetry.Instrumentation.AWS
12+
* Use 1.10.0-beta.1 of OpenTelemetry.Instrumentation.AWSLambda
13+
314
## 1.0.1
415

516
This is the first GA release of this distribution.

GrafanaOpenTelemetry.sln

-10
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grafana.OpenTelemetry.Tests
1515
EndProject
1616
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{2DC924CF-282A-446D-B94B-D2931E5C6130}"
1717
EndProject
18-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "net6.0", "net6.0", "{A9FD1876-1DC6-49A8-9E81-A8DD3BBD03F9}"
19-
EndProject
20-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "aspnetcore", "examples\net6.0\aspnetcore\aspnetcore.csproj", "{13045789-1D27-4694-BE88-B20534DD28EC}"
21-
EndProject
2218
Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose-aspnetcore", "docker\docker-compose-aspnetcore\docker-compose-aspnetcore.dcproj", "{A4C41298-ED4F-4A4C-9B18-014986186C71}"
2319
EndProject
2420
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docker", "docker", "{E63943FA-D9F6-4DC4-91EE-D0BD0BF8E324}"
@@ -45,10 +41,6 @@ Global
4541
{30810D69-3237-4260-93C2-DC601C5AC80F}.Debug|Any CPU.Build.0 = Debug|Any CPU
4642
{30810D69-3237-4260-93C2-DC601C5AC80F}.Release|Any CPU.ActiveCfg = Release|Any CPU
4743
{30810D69-3237-4260-93C2-DC601C5AC80F}.Release|Any CPU.Build.0 = Release|Any CPU
48-
{13045789-1D27-4694-BE88-B20534DD28EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
49-
{13045789-1D27-4694-BE88-B20534DD28EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
50-
{13045789-1D27-4694-BE88-B20534DD28EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
51-
{13045789-1D27-4694-BE88-B20534DD28EC}.Release|Any CPU.Build.0 = Release|Any CPU
5244
{A4C41298-ED4F-4A4C-9B18-014986186C71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5345
{A4C41298-ED4F-4A4C-9B18-014986186C71}.Debug|Any CPU.Build.0 = Debug|Any CPU
5446
{A4C41298-ED4F-4A4C-9B18-014986186C71}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -65,8 +57,6 @@ Global
6557
{B4761520-2B6F-4605-BC3B-66710F7439EA} = {F0687CB8-95E1-4372-9444-70676DE3A34A}
6658
{8CA452C6-61DA-49A9-8AA7-909D48E7ACF0} = {F0687CB8-95E1-4372-9444-70676DE3A34A}
6759
{30810D69-3237-4260-93C2-DC601C5AC80F} = {FB0399BE-6925-42B7-8431-C5A6E21DC8EC}
68-
{A9FD1876-1DC6-49A8-9E81-A8DD3BBD03F9} = {2DC924CF-282A-446D-B94B-D2931E5C6130}
69-
{13045789-1D27-4694-BE88-B20534DD28EC} = {A9FD1876-1DC6-49A8-9E81-A8DD3BBD03F9}
7060
{A4C41298-ED4F-4A4C-9B18-014986186C71} = {E63943FA-D9F6-4DC4-91EE-D0BD0BF8E324}
7161
{74BA358B-6EDB-463F-8AB2-313FAA4DE564} = {2DC924CF-282A-446D-B94B-D2931E5C6130}
7262
{BD1FB154-C711-4E37-947D-063F5DC4BF9E} = {74BA358B-6EDB-463F-8AB2-313FAA4DE564}

docker/docker-compose-aspnetcore/docker-compose-aspnetcore.dcproj

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<DockerServiceName>aspnetcore</DockerServiceName>
1010
</PropertyGroup>
1111
<ItemGroup>
12-
<None Include="docker-compose.net8.oats.yml" />
1312
<None Include="docker-compose.oats.yml" />
1413
<None Include="docker-compose.override.yml">
1514
<DependentUpon>docker-compose.yml</DependentUpon>

docker/docker-compose-aspnetcore/docker-compose.net8.oats.yml

-30
This file was deleted.

docker/docker-compose-aspnetcore/docker-compose.oats.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services:
55
image: ${DOCKER_REGISTRY-}aspnetcore
66
build:
77
context: ../..
8-
dockerfile: examples/net6.0/aspnetcore/Dockerfile
8+
dockerfile: examples/net8.0/aspnetcore/Dockerfile
99
environment:
1010
- OTEL_EXPORTER_OTLP_ENDPOINT=http://collector:4317
1111
ports:

docker/docker-compose-aspnetcore/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services:
55
image: ${DOCKER_REGISTRY-}aspnetcore
66
build:
77
context: ../..
8-
dockerfile: examples/net6.0/aspnetcore/Dockerfile
8+
dockerfile: examples/net8.0/aspnetcore/Dockerfile
99
depends_on:
1010
- redis
1111
- mssql

examples/net6.0/aspnetcore/Controllers/HttpClientController.cs

-46
This file was deleted.

examples/net6.0/aspnetcore/Controllers/MsSqlController.cs

-68
This file was deleted.

examples/net6.0/aspnetcore/Controllers/RedisController.cs

-53
This file was deleted.

examples/net6.0/aspnetcore/Controllers/WeatherForecastController.cs

-44
This file was deleted.

examples/net6.0/aspnetcore/Dockerfile

-24
This file was deleted.

0 commit comments

Comments
 (0)