Skip to content

Commit 63e52a8

Browse files
trasktrask
authored
Update otel (#2923)
1 parent 78a0fa7 commit 63e52a8

File tree

27 files changed

+552
-215
lines changed

27 files changed

+552
-215
lines changed

‎agent/agent-bootstrap/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ com.google.guava:guava-bom:31.1-jre=runtimeClasspath
1111
com.squareup.moshi:moshi:1.11.0=runtimeClasspath
1212
com.squareup.okio:okio:1.17.5=runtimeClasspath
1313
io.netty:netty-bom:4.1.89.Final=runtimeClasspath
14-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
15-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
16-
io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
17-
io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
14+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
15+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
16+
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
17+
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
1818
org.junit:junit-bom:5.9.2=runtimeClasspath
1919
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
2020
org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath

‎agent/agent-bootstrap/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/TemporaryMetricsView.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ private static Set<AttributeKey> buildDurationClientView() {
4646
Set<AttributeKey> view = new HashSet<>(durationAlwaysInclude);
4747
view.add(SemanticAttributes.NET_PEER_NAME);
4848
view.add(SemanticAttributes.NET_PEER_PORT);
49+
view.add(SemanticAttributes.NET_SOCK_PEER_ADDR);
4950
return view;
5051
}
5152

@@ -57,7 +58,8 @@ private static Set<AttributeKey> buildDurationServerView() {
5758
// - we prefer http.route (which is scrubbed) over http.target (which is not scrubbed).
5859
Set<AttributeKey> view = new HashSet<>(durationAlwaysInclude);
5960
view.add(SemanticAttributes.HTTP_SCHEME);
60-
view.add(SemanticAttributes.HTTP_HOST);
61+
view.add(SemanticAttributes.NET_HOST_NAME);
62+
view.add(SemanticAttributes.NET_HOST_PORT);
6163
view.add(SemanticAttributes.HTTP_ROUTE);
6264
// START APPLICATION INSIGHTS MODIFICATIONS
6365
view.add(SemanticAttributes.HTTP_USER_AGENT);
@@ -70,10 +72,10 @@ private static Set<AttributeKey> buildActiveRequestsView() {
7072
// https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/semantic_conventions/http-metrics.md#attributes
7173
Set<AttributeKey> view = new HashSet<>();
7274
view.add(SemanticAttributes.HTTP_METHOD);
73-
view.add(SemanticAttributes.HTTP_HOST);
7475
view.add(SemanticAttributes.HTTP_SCHEME);
7576
view.add(SemanticAttributes.HTTP_FLAVOR);
76-
view.add(SemanticAttributes.HTTP_SERVER_NAME);
77+
view.add(SemanticAttributes.NET_HOST_NAME);
78+
view.add(SemanticAttributes.NET_HOST_PORT);
7779
return view;
7880
}
7981

‎agent/agent-for-testing/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.9=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
66
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
77
io.netty:netty-bom:4.1.89.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
1212
org.junit:junit-bom:5.9.2=runtimeClasspath
1313
org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
1414
empty=

‎agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
66
com.google.errorprone:error_prone_annotations:2.18.0=runtimeClasspath
77
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
88
io.netty:netty-bom:4.1.89.Final=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
10-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
12-
io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
10+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
12+
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
1313
org.junit:junit-bom:5.9.2=runtimeClasspath
1414
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
1515
org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath

‎agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
66
com.google.errorprone:error_prone_annotations:2.18.0=runtimeClasspath
77
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
88
io.netty:netty-bom:4.1.89.Final=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
10-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
12-
io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
10+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
12+
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
1313
org.junit:junit-bom:5.9.2=runtimeClasspath
1414
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
1515
org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath

‎agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.9=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
66
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
77
io.netty:netty-bom:4.1.89.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
1212
org.junit:junit-bom:5.9.2=runtimeClasspath
1313
org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
1414
empty=

‎agent/agent-profiler/agent-alerting-api/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.9=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
66
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
77
io.netty:netty-bom:4.1.89.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
1212
org.junit:junit-bom:5.9.2=runtimeClasspath
1313
org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
1414
empty=

‎agent/agent-profiler/agent-alerting/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.9=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
66
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
77
io.netty:netty-bom:4.1.89.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
1212
org.junit:junit-bom:5.9.2=runtimeClasspath
1313
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
1414
org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath

‎agent/agent-profiler/agent-diagnostics-api/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.9=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
66
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
77
io.netty:netty-bom:4.1.89.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
1212
org.junit:junit-bom:5.9.2=runtimeClasspath
1313
org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
1414
empty=

‎agent/agent-tooling/gradle.lockfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ io.netty:netty-transport-native-epoll:4.1.89.Final=runtimeClasspath
5050
io.netty:netty-transport-native-kqueue:4.1.89.Final=runtimeClasspath
5151
io.netty:netty-transport-native-unix-common:4.1.89.Final=runtimeClasspath
5252
io.netty:netty-transport:4.1.89.Final=runtimeClasspath
53-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
54-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
55-
io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
56-
io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
57-
io.projectreactor.netty:reactor-netty-core:1.1.2=runtimeClasspath
58-
io.projectreactor.netty:reactor-netty-http:1.1.2=runtimeClasspath
59-
io.projectreactor:reactor-core:3.5.2=runtimeClasspath
53+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
54+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
55+
io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
56+
io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
57+
io.projectreactor.netty:reactor-netty-core:1.1.3=runtimeClasspath
58+
io.projectreactor.netty:reactor-netty-http:1.1.3=runtimeClasspath
59+
io.projectreactor:reactor-core:3.5.3=runtimeClasspath
6060
net.java.dev.jna:jna-platform:5.12.1=runtimeClasspath
6161
net.java.dev.jna:jna:5.12.1=runtimeClasspath
6262
net.minidev:accessors-smart:2.4.8=runtimeClasspath

0 commit comments

Comments
 (0)