Skip to content

Commit 00c2abe

Browse files
committed
fix github check failures.
1 parent 5bcbc9c commit 00c2abe

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,6 @@ If your change does not need a CHANGELOG entry, add the "skip changelog" label t
1818
- Support X-Ray Trace Id extraction from Lambda Context object, and respect user-configured OTEL_PROPAGATORS in AWS Lamdba instrumentation
1919
([#1191](https://github.com/aws-observability/aws-otel-java-instrumentation/pull/1191)) ([#1218](https://github.com/aws-observability/aws-otel-java-instrumentation/pull/1218))
2020
- Adaptive Sampling improvements: Ensure propagation of sampling rule across services and AWS accounts. Remove unnecessary B3 propagator.
21-
([#1201](https://github.com/aws-observability/aws-otel-java-instrumentation/pull/1201))
21+
([#1201](https://github.com/aws-observability/aws-otel-java-instrumentation/pull/1201))
22+
- Add support for new formal database semantic convention keys.
23+
([#1162](https://github.com/aws-observability/aws-otel-java-instrumentation/pull/1162))

awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsMetricAttributeGenerator.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ private static void setRemoteEnvironment(SpanData span, AttributesBuilder builde
353353
*/
354354
private static String generateRemoteOperation(SpanData span) {
355355
String remoteOperation = UNKNOWN_REMOTE_OPERATION;
356-
if (isKeyPresent(span, URL_FULL) || isKeyPresent(span, HTTP_URL)) {
356+
if (isKeyPresentWithFallback(span, URL_FULL, HTTP_URL)) {
357357
String httpUrl = getKeyValueWithFallback(span, URL_FULL, HTTP_URL);
358358
try {
359359
URL url;
@@ -949,7 +949,9 @@ private static String getRemoteService(SpanData span, AttributeKey<String> remot
949949
}
950950

951951
static String getRemoteServiceWithFallback(
952-
SpanData span, AttributeKey<String> remoteServiceKey, AttributeKey<String> remoteServiceFallbackKey) {
952+
SpanData span,
953+
AttributeKey<String> remoteServiceKey,
954+
AttributeKey<String> remoteServiceFallbackKey) {
953955
String remoteService = span.getAttributes().get(remoteServiceKey);
954956
if (remoteService == null) {
955957
return getRemoteService(span, remoteServiceFallbackKey);

0 commit comments

Comments
 (0)