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

Upgrade AWS dependency to latest version #127

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ used, for example `Grafana.OpenTelemetry 0.6.0-beta.1`):

*

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

*
*

## Symptom

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
matrix:
os: [ windows-latest, ubuntu-latest ]
version: [ net462, net6.0, net8.0 ]
version: [ net462, net8.0 ]
exclude:
- os: ubuntu-latest
version: net462
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Changelog

## Unreleased

### BREAKING CHANGES

* Drop support for .NET 6. EOL was November 12 2024

### New features

* Use 1.10.0-beta.1 of OpenTelemetry.Instrumentation.AWS
* Use 1.10.0-beta.1 of OpenTelemetry.Instrumentation.AWSLambda

## 1.0.1

This is the first GA release of this distribution.
Expand Down
10 changes: 0 additions & 10 deletions GrafanaOpenTelemetry.sln
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grafana.OpenTelemetry.Tests
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{2DC924CF-282A-446D-B94B-D2931E5C6130}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "net6.0", "net6.0", "{A9FD1876-1DC6-49A8-9E81-A8DD3BBD03F9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "aspnetcore", "examples\net6.0\aspnetcore\aspnetcore.csproj", "{13045789-1D27-4694-BE88-B20534DD28EC}"
EndProject
Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose-aspnetcore", "docker\docker-compose-aspnetcore\docker-compose-aspnetcore.dcproj", "{A4C41298-ED4F-4A4C-9B18-014986186C71}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docker", "docker", "{E63943FA-D9F6-4DC4-91EE-D0BD0BF8E324}"
Expand All @@ -45,10 +41,6 @@ Global
{30810D69-3237-4260-93C2-DC601C5AC80F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{30810D69-3237-4260-93C2-DC601C5AC80F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{30810D69-3237-4260-93C2-DC601C5AC80F}.Release|Any CPU.Build.0 = Release|Any CPU
{13045789-1D27-4694-BE88-B20534DD28EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{13045789-1D27-4694-BE88-B20534DD28EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{13045789-1D27-4694-BE88-B20534DD28EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{13045789-1D27-4694-BE88-B20534DD28EC}.Release|Any CPU.Build.0 = Release|Any CPU
{A4C41298-ED4F-4A4C-9B18-014986186C71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A4C41298-ED4F-4A4C-9B18-014986186C71}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A4C41298-ED4F-4A4C-9B18-014986186C71}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -65,8 +57,6 @@ Global
{B4761520-2B6F-4605-BC3B-66710F7439EA} = {F0687CB8-95E1-4372-9444-70676DE3A34A}
{8CA452C6-61DA-49A9-8AA7-909D48E7ACF0} = {F0687CB8-95E1-4372-9444-70676DE3A34A}
{30810D69-3237-4260-93C2-DC601C5AC80F} = {FB0399BE-6925-42B7-8431-C5A6E21DC8EC}
{A9FD1876-1DC6-49A8-9E81-A8DD3BBD03F9} = {2DC924CF-282A-446D-B94B-D2931E5C6130}
{13045789-1D27-4694-BE88-B20534DD28EC} = {A9FD1876-1DC6-49A8-9E81-A8DD3BBD03F9}
{A4C41298-ED4F-4A4C-9B18-014986186C71} = {E63943FA-D9F6-4DC4-91EE-D0BD0BF8E324}
{74BA358B-6EDB-463F-8AB2-313FAA4DE564} = {2DC924CF-282A-446D-B94B-D2931E5C6130}
{BD1FB154-C711-4E37-947D-063F5DC4BF9E} = {74BA358B-6EDB-463F-8AB2-313FAA4DE564}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<DockerServiceName>aspnetcore</DockerServiceName>
</PropertyGroup>
<ItemGroup>
<None Include="docker-compose.net8.oats.yml" />
<None Include="docker-compose.oats.yml" />
<None Include="docker-compose.override.yml">
<DependentUpon>docker-compose.yml</DependentUpon>
Expand Down
30 changes: 0 additions & 30 deletions docker/docker-compose-aspnetcore/docker-compose.net8.oats.yml

This file was deleted.

2 changes: 1 addition & 1 deletion docker/docker-compose-aspnetcore/docker-compose.oats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
image: ${DOCKER_REGISTRY-}aspnetcore
build:
context: ../..
dockerfile: examples/net6.0/aspnetcore/Dockerfile
dockerfile: examples/net8.0/aspnetcore/Dockerfile
environment:
- OTEL_EXPORTER_OTLP_ENDPOINT=http://collector:4317
ports:
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose-aspnetcore/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
image: ${DOCKER_REGISTRY-}aspnetcore
build:
context: ../..
dockerfile: examples/net6.0/aspnetcore/Dockerfile
dockerfile: examples/net8.0/aspnetcore/Dockerfile
depends_on:
- redis
- mssql
Expand Down
46 changes: 0 additions & 46 deletions examples/net6.0/aspnetcore/Controllers/HttpClientController.cs

This file was deleted.

68 changes: 0 additions & 68 deletions examples/net6.0/aspnetcore/Controllers/MsSqlController.cs

This file was deleted.

53 changes: 0 additions & 53 deletions examples/net6.0/aspnetcore/Controllers/RedisController.cs

This file was deleted.

This file was deleted.

24 changes: 0 additions & 24 deletions examples/net6.0/aspnetcore/Dockerfile

This file was deleted.

Loading