Skip to content

Commit 10326a7

Browse files
dependabot[bot]traskgithub-actions[bot]
authored
Bump io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom from 1.28.0 to 1.29.0 (#3256)
Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Trask Stalnaker <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 2d771fb commit 10326a7

File tree

29 files changed

+140
-136
lines changed

29 files changed

+140
-136
lines changed

‎agent/agent-bootstrap/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ dependencies {
88
// TODO (heya) remove this when updating to upstream micrometer instrumentation
99
compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
1010
compileOnly("io.opentelemetry:opentelemetry-semconv")
11+
compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")
1112
}

‎agent/agent-bootstrap/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.16=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath
66
com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath
77
io.netty:netty-bom:4.1.97.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath
1212
org.junit:junit-bom:5.10.0=runtimeClasspath
1313
org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath
1414
empty=

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

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,15 @@
1212
import io.opentelemetry.api.common.AttributeKey;
1313
import io.opentelemetry.api.common.Attributes;
1414
import io.opentelemetry.api.common.AttributesBuilder;
15+
import io.opentelemetry.instrumentation.api.instrumenter.http.internal.HttpAttributes;
16+
import io.opentelemetry.instrumentation.api.instrumenter.network.internal.NetworkAttributes;
17+
import io.opentelemetry.instrumentation.api.instrumenter.url.internal.UrlAttributes;
1518
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
1619
import java.util.HashSet;
1720
import java.util.Set;
1821
import java.util.function.BiConsumer;
1922

20-
// copied from OpenTelemetry Instrumentation 1.18.0
23+
// copied from OpenTelemetry Instrumentation 1.29.0
2124

2225
// this is temporary, see
2326
// https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/3962#issuecomment-906606325
@@ -35,7 +38,13 @@ private static Set<AttributeKey> buildDurationAlwaysInclude() {
3538
Set<AttributeKey> view = new HashSet<>();
3639
view.add(SemanticAttributes.HTTP_METHOD);
3740
view.add(SemanticAttributes.HTTP_STATUS_CODE); // Optional
38-
view.add(SemanticAttributes.HTTP_FLAVOR); // Optional
41+
view.add(SemanticAttributes.NET_PROTOCOL_NAME); // Optional
42+
view.add(SemanticAttributes.NET_PROTOCOL_VERSION); // Optional
43+
// stable semconv
44+
view.add(HttpAttributes.HTTP_REQUEST_METHOD);
45+
view.add(HttpAttributes.HTTP_RESPONSE_STATUS_CODE);
46+
view.add(NetworkAttributes.NETWORK_PROTOCOL_NAME);
47+
view.add(NetworkAttributes.NETWORK_PROTOCOL_VERSION);
3948
return view;
4049
}
4150

@@ -47,6 +56,10 @@ private static Set<AttributeKey> buildDurationClientView() {
4756
view.add(SemanticAttributes.NET_PEER_NAME);
4857
view.add(SemanticAttributes.NET_PEER_PORT);
4958
view.add(SemanticAttributes.NET_SOCK_PEER_ADDR);
59+
// stable semconv
60+
view.add(NetworkAttributes.SERVER_SOCKET_ADDRESS);
61+
view.add(NetworkAttributes.SERVER_ADDRESS);
62+
view.add(NetworkAttributes.SERVER_PORT);
5063
return view;
5164
}
5265

@@ -61,6 +74,8 @@ private static Set<AttributeKey> buildDurationServerView() {
6174
view.add(SemanticAttributes.NET_HOST_NAME);
6275
view.add(SemanticAttributes.NET_HOST_PORT);
6376
view.add(SemanticAttributes.HTTP_ROUTE);
77+
// stable semconv
78+
view.add(UrlAttributes.URL_SCHEME);
6479
// START APPLICATION INSIGHTS MODIFICATIONS
6580
view.add(SemanticAttributes.USER_AGENT_ORIGINAL);
6681
// END APPLICATION INSIGHTS MODIFICATIONS
@@ -73,9 +88,11 @@ private static Set<AttributeKey> buildActiveRequestsView() {
7388
Set<AttributeKey> view = new HashSet<>();
7489
view.add(SemanticAttributes.HTTP_METHOD);
7590
view.add(SemanticAttributes.HTTP_SCHEME);
76-
view.add(SemanticAttributes.HTTP_FLAVOR);
7791
view.add(SemanticAttributes.NET_HOST_NAME);
7892
view.add(SemanticAttributes.NET_HOST_PORT);
93+
// stable semconv
94+
view.add(HttpAttributes.HTTP_REQUEST_METHOD);
95+
view.add(UrlAttributes.URL_SCHEME);
7996
return view;
8097
}
8198

‎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.16=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath
66
com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath
77
io.netty:netty-bom:4.1.97.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath
1212
org.junit:junit-bom:5.10.0=runtimeClasspath
1313
org.testcontainers:testcontainers-bom:1.19.0=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.15.2=runtimeClasspath
66
com.google.errorprone:error_prone_annotations:2.21.1=runtimeClasspath
77
com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath
88
io.netty:netty-bom:4.1.97.Final=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath
10-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath
12-
io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath
10+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath
12+
io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath
1313
org.junit:junit-bom:5.10.0=runtimeClasspath
1414
org.slf4j:slf4j-api:2.0.7=runtimeClasspath
1515
org.testcontainers:testcontainers-bom:1.19.0=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.15.2=runtimeClasspath
66
com.google.errorprone:error_prone_annotations:2.21.1=runtimeClasspath
77
com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath
88
io.netty:netty-bom:4.1.97.Final=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath
10-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath
12-
io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath
10+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath
12+
io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath
1313
org.junit:junit-bom:5.10.0=runtimeClasspath
1414
org.slf4j:slf4j-api:2.0.7=runtimeClasspath
1515
org.testcontainers:testcontainers-bom:1.19.0=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.16=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath
66
com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath
77
io.netty:netty-bom:4.1.97.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath
1212
org.junit:junit-bom:5.10.0=runtimeClasspath
1313
org.testcontainers:testcontainers-bom:1.19.0=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.16=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath
66
com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath
77
io.netty:netty-bom:4.1.97.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath
1212
org.junit:junit-bom:5.10.0=runtimeClasspath
1313
org.testcontainers:testcontainers-bom:1.19.0=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.16=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath
66
com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath
77
io.netty:netty-bom:4.1.97.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath
1212
org.junit:junit-bom:5.10.0=runtimeClasspath
1313
org.slf4j:slf4j-api:2.0.7=runtimeClasspath
1414
org.testcontainers:testcontainers-bom:1.19.0=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.16=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath
66
com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath
77
io.netty:netty-bom:4.1.97.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath
1212
org.junit:junit-bom:5.10.0=runtimeClasspath
1313
org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath
1414
empty=

0 commit comments

Comments
 (0)