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.

Sign up for GitHub

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

Jump to bottom

[Instrumentation.AWS] Bump minimal AWS SDKs to 3.7.300 #1542

Merged
merged 1 commit into from
Jan 22, 2024
Merged

[Instrumentation.AWS] Bump minimal AWS SDKs to 3.7.300 #1542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions src/OpenTelemetry.Instrumentation.AWS/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## Unreleased

* Updated dependency on AWS .NET SDK to version 3.7.300.
([#1542](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1542))

## 1.1.0-beta.2

Released 2023-Dec-01
Expand Down
6 changes: 3 additions & 3 deletions src/OpenTelemetry.Instrumentation.AWS/OpenTelemetry.Instrumentation.AWS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.Core" Version="3.7.100" />
<PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.7.100" />
<PackageReference Include="AWSSDK.SQS" Version="3.7.100" />
<PackageReference Include="AWSSDK.Core" Version="3.7.300" />
<PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.7.300" />
<PackageReference Include="AWSSDK.SQS" Version="3.7.300" />
<PackageReference Include="OpenTelemetry.Extensions.AWS" Version="1.3.0-beta.1" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion test/OpenTelemetry.Instrumentation.AWS.Tests/OpenTelemetry.Instrumentation.AWS.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.100" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.300" />
<PackageReference Include="OpenTelemetry.Exporter.InMemory" Version="$(OpenTelemetryCoreLatestVersion)" />
</ItemGroup>

Expand Down
3 changes: 1 addition & 2 deletions test/OpenTelemetry.Instrumentation.AWS.Tests/TestAWSClientInstrumentation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,7 @@ public void TestSQSSendMessageSuccessful()
{
var sqs = new AmazonSQSClient(new AnonymousAWSCredentials(), RegionEndpoint.USEast1);
string requestId = @"fakerequ-esti-dfak-ereq-uestidfakere";
string dummyResponse = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<ReceiveMessageResponse>SomeDummyResponse</ReceiveMessageResponse>";
string dummyResponse = "{}";
cijothomas marked this conversation as resolved.
Show resolved Hide resolved
CustomResponses.SetResponse(sqs, dummyResponse, requestId, true);
var send_msg_req = new SendMessageRequest();
send_msg_req.QueueUrl = "https://sqs.us-east-1.amazonaws.com/123456789/MyTestQueue";
Expand Down
8 changes: 8 additions & 0 deletions test/OpenTelemetry.Instrumentation.AWS.Tests/TestRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
using System.IO;
using Amazon;
using Amazon.Runtime;
using Amazon.Runtime.Endpoints;
using Amazon.Runtime.Internal;
using Amazon.Runtime.Internal.Auth;
using Amazon.Runtime.Internal.Util;

namespace OpenTelemetry.Instrumentation.AWS.Tests;

Expand Down Expand Up @@ -81,6 +83,12 @@ internal class TestRequest(ParameterCollection parameters) : IRequest

public bool UseDoubleEncoding { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }

public IPropertyBag EndpointAttributes { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }

public CompressionEncodingAlgorithm CompressionAlgorithm { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }

public ChecksumData ChecksumData { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }

public void AddPathResource(string key, string value)
{
throw new NotImplementedException();
Expand Down
6 changes: 4 additions & 2 deletions test/OpenTelemetry.Instrumentation.AWS.Tests/TestRequestContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0

using System;
using System.Collections.Generic;
using System.Threading;
using Amazon.Runtime;
using Amazon.Runtime.Internal;
Expand All @@ -13,10 +14,9 @@ namespace OpenTelemetry.Instrumentation.AWS.Tests;

internal class TestRequestContext(AmazonWebServiceRequest originalRequest, IRequest request) : IRequestContext
{
private readonly AmazonWebServiceRequest originalRequest = originalRequest;
private IRequest request = request;

public AmazonWebServiceRequest OriginalRequest => this.originalRequest;
public AmazonWebServiceRequest OriginalRequest { get; set; } = originalRequest;

public string RequestName => throw new NotImplementedException();

Expand Down Expand Up @@ -59,4 +59,6 @@ internal class TestRequestContext(AmazonWebServiceRequest originalRequest, IRequ
public bool IsLastExceptionRetryable { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }

public Guid InvocationId => throw new NotImplementedException();

public IDictionary<string, object> ContextAttributes { get; } = new Dictionary<string, object>();
}
Loading