Skip to content

Commit 54a9f00

Browse files
SylvainJugeSylvainJuge
committed
Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into indy-servlet3
2 parents affe804 + 76c2d2d commit 54a9f00

File tree

328 files changed

+6995
-5949
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

328 files changed

+6995
-5949
lines changed

‎.github/workflows/codeql-daily.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
java-version-file: .java-version
3131

3232
- name: Initialize CodeQL
33-
uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
33+
uses: github/codeql-action/init@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
3434
with:
3535
languages: java
3636
# using "latest" helps to keep up with the latest Kotlin support
@@ -45,7 +45,7 @@ jobs:
4545
run: ./gradlew assemble -x javadoc --no-build-cache --no-daemon
4646

4747
- name: Perform CodeQL analysis
48-
uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
48+
uses: github/codeql-action/analyze@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
4949

5050
workflow-notification:
5151
needs:

‎.github/workflows/scorecard.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,6 @@ jobs:
6464

6565
# Upload the results to GitHub's code scanning dashboard.
6666
- name: "Upload to code-scanning"
67-
uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
67+
uses: github/codeql-action/upload-sarif@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
6868
with:
6969
sarif_file: results.sarif

‎conventions/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ dependencies {
6969
implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.2")
7070
implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.1.0")
7171
implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.1.0")
72-
implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.4")
72+
implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.5")
7373

7474
testImplementation(enforcedPlatform("org.junit:junit-bom:5.11.3"))
7575
testImplementation("org.junit.jupiter:junit-jupiter-api")

‎conventions/src/main/kotlin/otel.java-conventions.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ dependencies {
161161
compileOnly("com.google.errorprone:error_prone_annotations")
162162

163163
codenarc("org.codenarc:CodeNarc:3.5.0")
164-
codenarc(platform("org.codehaus.groovy:groovy-bom:3.0.22"))
164+
codenarc(platform("org.codehaus.groovy:groovy-bom:3.0.23"))
165165

166166
modules {
167167
// checkstyle uses the very old google-collections which causes Java 9 module conflict with
@@ -434,7 +434,7 @@ codenarc {
434434
checkstyle {
435435
configFile = rootProject.file("buildscripts/checkstyle.xml")
436436
// this version should match the version of google_checks.xml used as basis for above configuration
437-
toolVersion = "10.20.0"
437+
toolVersion = "10.20.1"
438438
maxWarnings = 0
439439
}
440440

‎dependencyManagement/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ val dependencyVersions = hashMapOf<String, String>()
88
rootProject.extra["versions"] = dependencyVersions
99

1010
// this line is managed by .github/scripts/update-sdk-version.sh
11-
val otelSdkVersion = "1.43.0"
11+
val otelSdkVersion = "1.44.1"
1212
val otelContribVersion = "1.40.0-alpha"
1313
val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
1414

1515
// Need both BOM and groovy jars
16-
val groovyVersion = "4.0.23"
16+
val groovyVersion = "4.0.24"
1717

1818
// We don't force libraries we instrument to new versions since we compile and test against specific
1919
// old baseline versions but we do try to force those libraries' transitive dependencies to new

‎docs/contributing/debugging.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@ builds by adding the following to `~/.gradle/gradle.properties` before building.
6464
disableShadowRelocate=true
6565
```
6666

67+
WARNING: disabling shadow renaming will make some of the tests fail. In some cases it can also make
68+
tests pass when they really should be failing. Use with caution and be prepared for unexpected
69+
behavior.
70+
6771
## Missing GraalVM hints
6872

6973
Enable the GraalVM tracing agent:

‎docs/supported-libraries.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ These are the supported libraries and frameworks:
9292
| [Jodd Http](https://http.jodd.org/) | 4.2+ | N/A | [HTTP Client Spans], [HTTP Client Metrics] |
9393
| [JSP](https://javaee.github.io/javaee-spec/javadocs/javax/servlet/jsp/package-summary.html) | 2.3+ | N/A | Controller Spans [3] |
9494
| [Kotlin Coroutines](https://kotlinlang.org/docs/coroutines-overview.html) | 1.0+ | N/A | Context propagation |
95-
| [Ktor](https://github.com/ktorio/ktor) | 1.0+ | [opentelemetry-ktor-1.0](../instrumentation/ktor/ktor-1.0/library),<br>[opentelemetry-ktor-2.0](../instrumentation/ktor/ktor-2.0/library) | [HTTP Client Spans], [HTTP Client Metrics], [HTTP Server Spans], [HTTP Server Metrics] |
95+
| [Ktor](https://github.com/ktorio/ktor) | 1.0+ | [opentelemetry-ktor-1.0](../instrumentation/ktor/ktor-1.0/library),<br>[opentelemetry-ktor-2.0](../instrumentation/ktor/ktor-2.0/library),<br>[opentelemetry-ktor-3.0](../instrumentation/ktor/ktor-3.0/library) | [HTTP Client Spans], [HTTP Client Metrics], [HTTP Server Spans], [HTTP Server Metrics] |
9696
| [Kubernetes Client](https://github.com/kubernetes-client/java) | 7.0+ | N/A | [HTTP Client Spans] |
9797
| [Lettuce](https://github.com/lettuce-io/lettuce-core) | 4.0+ | [opentelemetry-lettuce-5.1](../instrumentation/lettuce/lettuce-5.1/library) | [Database Client Spans] |
9898
| [Log4j 1](https://logging.apache.org/log4j/1.2/) | 1.2+ | N/A | none |

‎examples/distro/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ subprojects {
2727
ext {
2828
versions = [
2929
// this line is managed by .github/scripts/update-sdk-version.sh
30-
opentelemetrySdk : "1.43.0",
30+
opentelemetrySdk : "1.44.1",
3131

3232
// these lines are managed by .github/scripts/update-version.sh
3333
opentelemetryJavaagent : "2.10.0-SNAPSHOT",

‎examples/extension/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ version '1.0'
2323
ext {
2424
versions = [
2525
// this line is managed by .github/scripts/update-sdk-version.sh
26-
opentelemetrySdk : "1.43.0",
26+
opentelemetrySdk : "1.44.1",
2727

2828
// these lines are managed by .github/scripts/update-version.sh
2929
opentelemetryJavaagent : "2.10.0-SNAPSHOT",

‎instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/network/internal/InternalNetworkAttributesExtractor.java‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,23 @@ public InternalNetworkAttributesExtractor(
3333
}
3434

3535
public void onEnd(AttributesBuilder attributes, REQUEST request, @Nullable RESPONSE response) {
36-
String protocolName = lowercase(getter.getNetworkProtocolName(request, response));
37-
String protocolVersion = lowercase(getter.getNetworkProtocolVersion(request, response));
38-
3936
if (captureProtocolAttributes) {
40-
String transport = lowercase(getter.getNetworkTransport(request, response));
41-
internalSet(attributes, NetworkAttributes.NETWORK_TRANSPORT, transport);
37+
internalSet(
38+
attributes,
39+
NetworkAttributes.NETWORK_TRANSPORT,
40+
lowercase(getter.getNetworkTransport(request, response)));
4241
internalSet(
4342
attributes,
4443
NetworkAttributes.NETWORK_TYPE,
4544
lowercase(getter.getNetworkType(request, response)));
46-
internalSet(attributes, NetworkAttributes.NETWORK_PROTOCOL_NAME, protocolName);
47-
internalSet(attributes, NetworkAttributes.NETWORK_PROTOCOL_VERSION, protocolVersion);
45+
internalSet(
46+
attributes,
47+
NetworkAttributes.NETWORK_PROTOCOL_NAME,
48+
lowercase(getter.getNetworkProtocolName(request, response)));
49+
internalSet(
50+
attributes,
51+
NetworkAttributes.NETWORK_PROTOCOL_VERSION,
52+
lowercase(getter.getNetworkProtocolVersion(request, response)));
4853
}
4954

5055
if (captureLocalSocketAttributes) {

0 commit comments

Comments
 (0)