Skip to content

Commit

Permalink
run dotnet format
Browse files Browse the repository at this point in the history
  • Loading branch information
ppittle committed Dec 6, 2024
1 parent 7ffa650 commit ddef75b
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 11 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
#nullable enable
OpenTelemetry.AWS.SemanticConventionVersion
OpenTelemetry.AWS.SemanticConventionVersion.Latest = 0 -> OpenTelemetry.AWS.SemanticConventionVersion
OpenTelemetry.AWS.SemanticConventionVersion.v1_10_1_Experimental = 2 -> OpenTelemetry.AWS.SemanticConventionVersion
OpenTelemetry.AWS.SemanticConventionVersion.v1_10_Experimental = 1 -> OpenTelemetry.AWS.SemanticConventionVersion
OpenTelemetry.Instrumentation.AWS.AWSClientInstrumentationOptions
OpenTelemetry.Instrumentation.AWS.AWSClientInstrumentationOptions.AWSClientInstrumentationOptions() -> void
OpenTelemetry.Instrumentation.AWS.AWSClientInstrumentationOptions.SemanticConventionVersion.get -> OpenTelemetry.AWS.SemanticConventionVersion
OpenTelemetry.Instrumentation.AWS.AWSClientInstrumentationOptions.SemanticConventionVersion.set -> void
OpenTelemetry.Instrumentation.AWS.AWSClientInstrumentationOptions.SuppressDownstreamInstrumentation.get -> bool
OpenTelemetry.Instrumentation.AWS.AWSClientInstrumentationOptions.SuppressDownstreamInstrumentation.set -> void
OpenTelemetry.Trace.TracerProviderBuilderExtensions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using Amazon.Runtime.Telemetry;
using OpenTelemetry.AWS;
using OpenTelemetry.Context.Propagation;
using OpenTelemetry.Trace;

namespace OpenTelemetry.Instrumentation.AWS.Implementation;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ public class AWSLambdaInstrumentationOptions
/// </remarks>
public bool SetParentFromBatch { get; set; }

/// <inheritdoc cref="OpenTelemetry.AWS.SemanticConventionVersion"/>
/// <inheritdoc cref="AWS.SemanticConventionVersion"/>
public SemanticConventionVersion SemanticConventionVersion { get; set; } = AWSSemanticConventions.DefaultSemanticConventionVersion;

Check failure on line 28 in src/OpenTelemetry.Instrumentation.AWSLambda/AWSLambdaInstrumentationOptions.cs

View workflow job for this annotation

GitHub Actions / build-test-instrumentation-aws / build-test (ubuntu-latest, net8.0)

Symbol 'OpenTelemetry.Instrumentation.AWSLambda.AWSLambdaInstrumentationOptions.SemanticConventionVersion.get -> OpenTelemetry.AWS.SemanticConventionVersion' is not part of the declared public API (https://github.com/dotnet/roslyn-analyzers/blob/main/src/PublicApiAnalyzers/PublicApiAnalyzers.Help.md)

Check failure on line 28 in src/OpenTelemetry.Instrumentation.AWSLambda/AWSLambdaInstrumentationOptions.cs

View workflow job for this annotation

GitHub Actions / build-test-instrumentation-aws / build-test (ubuntu-latest, net8.0)

Symbol 'OpenTelemetry.Instrumentation.AWSLambda.AWSLambdaInstrumentationOptions.SemanticConventionVersion.set -> void' is not part of the declared public API (https://github.com/dotnet/roslyn-analyzers/blob/main/src/PublicApiAnalyzers/PublicApiAnalyzers.Help.md)

Check failure on line 28 in src/OpenTelemetry.Instrumentation.AWSLambda/AWSLambdaInstrumentationOptions.cs

View workflow job for this annotation

GitHub Actions / build-test-instrumentation-aws / build-test (ubuntu-latest, net9.0)

Symbol 'OpenTelemetry.Instrumentation.AWSLambda.AWSLambdaInstrumentationOptions.SemanticConventionVersion.get -> OpenTelemetry.AWS.SemanticConventionVersion' is not part of the declared public API (https://github.com/dotnet/roslyn-analyzers/blob/main/src/PublicApiAnalyzers/PublicApiAnalyzers.Help.md)

Check failure on line 28 in src/OpenTelemetry.Instrumentation.AWSLambda/AWSLambdaInstrumentationOptions.cs

View workflow job for this annotation

GitHub Actions / build-test-instrumentation-aws / build-test (ubuntu-latest, net9.0)

Symbol 'OpenTelemetry.Instrumentation.AWSLambda.AWSLambdaInstrumentationOptions.SemanticConventionVersion.set -> void' is not part of the declared public API (https://github.com/dotnet/roslyn-analyzers/blob/main/src/PublicApiAnalyzers/PublicApiAnalyzers.Help.md)

Check failure on line 28 in src/OpenTelemetry.Instrumentation.AWSLambda/AWSLambdaInstrumentationOptions.cs

View workflow job for this annotation

GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net8.0)

Symbol 'OpenTelemetry.Instrumentation.AWSLambda.AWSLambdaInstrumentationOptions.SemanticConventionVersion.get -> OpenTelemetry.AWS.SemanticConventionVersion' is not part of the declared public API (https://github.com/dotnet/roslyn-analyzers/blob/main/src/PublicApiAnalyzers/PublicApiAnalyzers.Help.md)

Check failure on line 28 in src/OpenTelemetry.Instrumentation.AWSLambda/AWSLambdaInstrumentationOptions.cs

View workflow job for this annotation

GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net8.0)

Symbol 'OpenTelemetry.Instrumentation.AWSLambda.AWSLambdaInstrumentationOptions.SemanticConventionVersion.set -> void' is not part of the declared public API (https://github.com/dotnet/roslyn-analyzers/blob/main/src/PublicApiAnalyzers/PublicApiAnalyzers.Help.md)

Check failure on line 28 in src/OpenTelemetry.Instrumentation.AWSLambda/AWSLambdaInstrumentationOptions.cs

View workflow job for this annotation

GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net9.0)

Symbol 'OpenTelemetry.Instrumentation.AWSLambda.AWSLambdaInstrumentationOptions.SemanticConventionVersion.get -> OpenTelemetry.AWS.SemanticConventionVersion' is not part of the declared public API (https://github.com/dotnet/roslyn-analyzers/blob/main/src/PublicApiAnalyzers/PublicApiAnalyzers.Help.md)

Check failure on line 28 in src/OpenTelemetry.Instrumentation.AWSLambda/AWSLambdaInstrumentationOptions.cs

View workflow job for this annotation

GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net9.0)

Symbol 'OpenTelemetry.Instrumentation.AWSLambda.AWSLambdaInstrumentationOptions.SemanticConventionVersion.set -> void' is not part of the declared public API (https://github.com/dotnet/roslyn-analyzers/blob/main/src/PublicApiAnalyzers/PublicApiAnalyzers.Help.md)

Check failure on line 28 in src/OpenTelemetry.Instrumentation.AWSLambda/AWSLambdaInstrumentationOptions.cs

View workflow job for this annotation

GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net462)

Symbol 'OpenTelemetry.Instrumentation.AWSLambda.AWSLambdaInstrumentationOptions.SemanticConventionVersion.get -> OpenTelemetry.AWS.SemanticConventionVersion' is not part of the declared public API (https://github.com/dotnet/roslyn-analyzers/blob/main/src/PublicApiAnalyzers/PublicApiAnalyzers.Help.md)

Check failure on line 28 in src/OpenTelemetry.Instrumentation.AWSLambda/AWSLambdaInstrumentationOptions.cs

View workflow job for this annotation

GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net462)

Symbol 'OpenTelemetry.Instrumentation.AWSLambda.AWSLambdaInstrumentationOptions.SemanticConventionVersion.set -> void' is not part of the declared public API (https://github.com/dotnet/roslyn-analyzers/blob/main/src/PublicApiAnalyzers/PublicApiAnalyzers.Help.md)
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using Amazon.Lambda.APIGatewayEvents;
using Amazon.Lambda.ApplicationLoadBalancerEvents;
using OpenTelemetry.AWS;
using OpenTelemetry.Internal;

namespace OpenTelemetry.Instrumentation.AWSLambda.Implementation;

Expand Down
5 changes: 3 additions & 2 deletions src/Shared/AWS/AWSSemanticConventions.Base.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

using OpenTelemetry.SemanticConventions;


namespace OpenTelemetry.AWS;

// disable Style Warnings to improve readability of this specific file.
Expand All @@ -21,7 +22,7 @@ internal static partial class AWSSemanticConventions
/// to use it. This helps ensure the attribute doesn't get used if the user has specified
/// a specific <see cref="SemanticConventionVersion"/>.
///
/// See <see cref="AWSSemanticConventions.GetSemanticConventionVersion"/> for details.
/// See <see cref="GetSemanticConventionVersion"/> for details.
/// </summary>
private abstract class AWSSemanticConventionsBase
{
Expand Down
2 changes: 1 addition & 1 deletion src/Shared/AWS/AWSSemanticConventions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
namespace OpenTelemetry.AWS;

/// <summary>
/// Abstracts the complexities of honoring <see cref="OpenTelemetry.AWS.SemanticConventionVersion"/>.
/// Abstracts the complexities of honoring <see cref="AWS.SemanticConventionVersion"/>.
/// <para/>
/// Classes emitting attributes can use the extension methods in this class to build
/// a List of <see cref="KeyValuePair"/>s containing Attribute Name and Value without

Check failure on line 20 in src/Shared/AWS/AWSSemanticConventions.cs

View workflow job for this annotation

GitHub Actions / build-test-resources-aws / build-test (ubuntu-latest, net8.0)

XML comment has cref attribute 'KeyValuePair' that could not be resolved

Check failure on line 20 in src/Shared/AWS/AWSSemanticConventions.cs

View workflow job for this annotation

GitHub Actions / build-test-instrumentation-aws / build-test (ubuntu-latest, net8.0)

XML comment has cref attribute 'KeyValuePair' that could not be resolved

Check failure on line 20 in src/Shared/AWS/AWSSemanticConventions.cs

View workflow job for this annotation

GitHub Actions / build-test-instrumentation-aws / build-test (ubuntu-latest, net9.0)

XML comment has cref attribute 'KeyValuePair' that could not be resolved

Check failure on line 20 in src/Shared/AWS/AWSSemanticConventions.cs

View workflow job for this annotation

GitHub Actions / build-test-resources-aws / build-test (ubuntu-latest, net9.0)

XML comment has cref attribute 'KeyValuePair' that could not be resolved

Check failure on line 20 in src/Shared/AWS/AWSSemanticConventions.cs

View workflow job for this annotation

GitHub Actions / build-test-resources-aws / build-test (windows-latest, net9.0)

XML comment has cref attribute 'KeyValuePair' that could not be resolved

Check failure on line 20 in src/Shared/AWS/AWSSemanticConventions.cs

View workflow job for this annotation

GitHub Actions / build-test-resources-aws / build-test (windows-latest, net9.0)

XML comment has cref attribute 'KeyValuePair' that could not be resolved

Check failure on line 20 in src/Shared/AWS/AWSSemanticConventions.cs

View workflow job for this annotation

GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net8.0)

XML comment has cref attribute 'KeyValuePair' that could not be resolved

Check failure on line 20 in src/Shared/AWS/AWSSemanticConventions.cs

View workflow job for this annotation

GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net8.0)

XML comment has cref attribute 'KeyValuePair' that could not be resolved

Check failure on line 20 in src/Shared/AWS/AWSSemanticConventions.cs

View workflow job for this annotation

GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net9.0)

XML comment has cref attribute 'KeyValuePair' that could not be resolved

Check failure on line 20 in src/Shared/AWS/AWSSemanticConventions.cs

View workflow job for this annotation

GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net9.0)

XML comment has cref attribute 'KeyValuePair' that could not be resolved

Check failure on line 20 in src/Shared/AWS/AWSSemanticConventions.cs

View workflow job for this annotation

GitHub Actions / build-test-resources-aws / build-test (windows-latest, net8.0)

XML comment has cref attribute 'KeyValuePair' that could not be resolved

Check failure on line 20 in src/Shared/AWS/AWSSemanticConventions.cs

View workflow job for this annotation

GitHub Actions / build-test-resources-aws / build-test (windows-latest, net8.0)

XML comment has cref attribute 'KeyValuePair' that could not be resolved

Check failure on line 20 in src/Shared/AWS/AWSSemanticConventions.cs

View workflow job for this annotation

GitHub Actions / build-test-resources-aws / build-test (windows-latest, net462)

XML comment has cref attribute 'KeyValuePair' that could not be resolved

Check failure on line 20 in src/Shared/AWS/AWSSemanticConventions.cs

View workflow job for this annotation

GitHub Actions / build-test-resources-aws / build-test (windows-latest, net462)

XML comment has cref attribute 'KeyValuePair' that could not be resolved

Check failure on line 20 in src/Shared/AWS/AWSSemanticConventions.cs

View workflow job for this annotation

GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net462)

XML comment has cref attribute 'KeyValuePair' that could not be resolved

Check failure on line 20 in src/Shared/AWS/AWSSemanticConventions.cs

View workflow job for this annotation

GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net462)

XML comment has cref attribute 'KeyValuePair' that could not be resolved
Expand Down
3 changes: 3 additions & 0 deletions src/Shared/AWS/AWSSemanticConventions.v1.10.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

namespace OpenTelemetry.AWS;

// disable Style Warnings to improve readability of this specific file.
Expand Down
4 changes: 4 additions & 0 deletions src/Shared/AWS/AWSSemanticConventions.v1.10_1.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

namespace OpenTelemetry.AWS;

// disable Style Warnings to improve readability of this specific file.
Expand All @@ -21,6 +24,7 @@ private class AWSSemanticConventions_v1_10_1 : AWSSemanticConventions_v1_10
// HTTP Attributes
public override string AttributeHttpStatusCode => this.AttributeHttpResponseStatusCode;
public override string AttributeHttpScheme => this.AttributeUrlScheme;

//public override string AttributeHttpTarget => string.Empty; // value no longer written ---- move to new PR
public override string AttributeHttpMethod => this.AttributeHttpRequestMethod;
public override string AttributeHttpResponseStatusCode => "http.response.status_code";
Expand Down
3 changes: 3 additions & 0 deletions src/Shared/AWS/SemanticConventionVersion.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

namespace OpenTelemetry.AWS;

#pragma warning disable SA1300
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace OpenTelemetry.Instrumentation.AWSLambda.Tests.Implementation;
#else
[Collection("Sequential-.NET8")]
#endif
public class AWSLambdaInstrumentationOptionsTests :IDisposable
public class AWSLambdaInstrumentationOptionsTests : IDisposable
{
[Fact]
public void CanUseSemanticConvention1_10()
Expand Down Expand Up @@ -75,8 +75,7 @@ private void CheckHttpTags(SemanticConventionVersion version, List<string> expec
using var _ =

Check warning on line 75 in test/OpenTelemetry.Instrumentation.AWSLambda.Tests/Implementation/AWSLambdaInstrumentationOptionsTests.cs

View workflow job for this annotation

GitHub Actions / lint-dotnet-format / run-dotnet-format

Variable '_' should begin with lower-case letter

Check warning on line 75 in test/OpenTelemetry.Instrumentation.AWSLambda.Tests/Implementation/AWSLambdaInstrumentationOptionsTests.cs

View workflow job for this annotation

GitHub Actions / lint-dotnet-format / run-dotnet-format

Variable '_' should begin with lower-case letter
Sdk.CreateTracerProviderBuilder()
.AddAWSLambdaConfigurations(c =>
c.SemanticConventionVersion = version
)
c.SemanticConventionVersion = version)
.Build();

var actualTags = AWSLambdaHttpUtils.GetHttpTags(request);
Expand All @@ -103,8 +102,7 @@ public void Dispose()
// Latest following these tests.
Sdk.CreateTracerProviderBuilder()
.AddAWSLambdaConfigurations(c =>
c.SemanticConventionVersion = SemanticConventionVersion.Latest
)
c.SemanticConventionVersion = SemanticConventionVersion.Latest)
.Build();
}
}

0 comments on commit ddef75b

Please sign in to comment.