Skip to content

Commit a13a5c0

Browse files
author
Christoph Berg
committed
Bumped opentelemetry-semconv to the latest version
- Added opentelemetry-semconv-incubating to have access to constants for used attributes - Switched used attributes to be imported from classes replacing SemanticAttributes
1 parent 610c3f1 commit a13a5c0

File tree

4 files changed

+14
-9
lines changed

4 files changed

+14
-9
lines changed

riptide-opentelemetry/pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<properties>
2020
<opentelemetry.version>1.39.0</opentelemetry.version>
21-
<opentelemetry-semconv.version>1.25.0-alpha</opentelemetry-semconv.version>
21+
<opentelemetry-semconv.version>1.30.0-rc.1</opentelemetry-semconv.version>
2222
</properties>
2323

2424
<dependencyManagement>
@@ -48,6 +48,11 @@
4848
<artifactId>opentelemetry-semconv</artifactId>
4949
<version>${opentelemetry-semconv.version}</version>
5050
</dependency>
51+
<dependency>
52+
<groupId>io.opentelemetry.semconv</groupId>
53+
<artifactId>opentelemetry-semconv-incubating</artifactId>
54+
<version>1.30.0-alpha-rc.1</version>
55+
</dependency>
5156
<dependency>
5257
<groupId>io.opentelemetry</groupId>
5358
<artifactId>opentelemetry-sdk-testing</artifactId>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package org.zalando.riptide.opentelemetry.span;
22

33
import io.opentelemetry.api.trace.Span;
4-
import io.opentelemetry.semconv.SemanticAttributes;
4+
import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes;
55
import org.zalando.riptide.RequestArguments;
66

77
public class HttpHostSpanDecorator implements SpanDecorator {
88

99
@Override
1010
public void onRequest(final Span span, final RequestArguments arguments) {
11-
span.setAttribute(SemanticAttributes.HTTP_HOST, arguments.getRequestUri().getHost());
11+
span.setAttribute(HttpIncubatingAttributes.HTTP_HOST, arguments.getRequestUri().getHost());
1212
}
1313
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package org.zalando.riptide.opentelemetry.span;
22

33
import io.opentelemetry.api.trace.Span;
4-
import io.opentelemetry.semconv.SemanticAttributes;
4+
import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes;
55
import org.zalando.riptide.RequestArguments;
66

77
public class HttpMethodSpanDecorator implements SpanDecorator {
88

99
@Override
1010
public void onRequest(final Span span, final RequestArguments arguments) {
11-
span.setAttribute(SemanticAttributes.HTTP_METHOD, arguments.getMethod().name());
11+
span.setAttribute(HttpIncubatingAttributes.HTTP_METHOD, arguments.getMethod().name());
1212
}
1313
}

riptide-opentelemetry/src/test/java/org/zalando/riptide/opentelemetry/OpenTelemetryPluginTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import io.opentelemetry.sdk.trace.data.EventData;
1111
import io.opentelemetry.sdk.trace.data.SpanData;
1212
import io.opentelemetry.sdk.trace.data.StatusData;
13-
import io.opentelemetry.semconv.SemanticAttributes;
13+
import io.opentelemetry.semconv.ExceptionAttributes;
1414
import lombok.SneakyThrows;
1515
import okhttp3.mockwebserver.MockResponse;
1616
import okhttp3.mockwebserver.MockWebServer;
@@ -204,9 +204,9 @@ void shouldTraceRequestAndNetworkError() {
204204
assertThat(events.size(), is(1));
205205

206206
final Attributes eventAttributes = child.getEvents().get(0).getAttributes();
207-
assertThat(eventAttributes.get(SemanticAttributes.EXCEPTION_TYPE), containsString("SocketTimeoutException"));
208-
assertThat(eventAttributes.get(SemanticAttributes.EXCEPTION_MESSAGE), containsString("Read timed out"));
209-
assertThat(eventAttributes.get(SemanticAttributes.EXCEPTION_STACKTRACE), is(notNullValue()));
207+
assertThat(eventAttributes.get(ExceptionAttributes.EXCEPTION_TYPE), containsString("SocketTimeoutException"));
208+
assertThat(eventAttributes.get(ExceptionAttributes.EXCEPTION_MESSAGE), containsString("Read timed out"));
209+
assertThat(eventAttributes.get(ExceptionAttributes.EXCEPTION_STACKTRACE), is(notNullValue()));
210210

211211
verify(server, 1, "/");
212212
}

0 commit comments

Comments
 (0)