Skip to content

Commit a7e4979

Browse files
trasktrask
authored
Merge branch 'main' into rename-servlet-common-internal
2 parents adf0b6e + 6a3862f commit a7e4979

62 files changed

Lines changed: 111 additions & 94 deletions

File tree

Some content is hidden

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

‎.fossa.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,10 +231,10 @@ targets:
231231
target: ':instrumentation:oracle-ucp-11.2:library'
232232
- type: gradle
233233
path: ./
234-
target: ':instrumentation:oshi:javaagent'
234+
target: ':instrumentation:oshi-5.0:javaagent'
235235
- type: gradle
236236
path: ./
237-
target: ':instrumentation:oshi:library'
237+
target: ':instrumentation:oshi-5.0:library'
238238
- type: gradle
239239
path: ./
240240
target: ':instrumentation:payara-5.2020:javaagent'
@@ -489,7 +489,7 @@ targets:
489489
target: ':instrumentation:elasticsearch:elasticsearch-transport-6.0:javaagent'
490490
- type: gradle
491491
path: ./
492-
target: ':instrumentation:elasticsearch:elasticsearch-transport-common:javaagent'
492+
target: ':instrumentation:elasticsearch:elasticsearch-transport-common-5.0:javaagent'
493493
- type: gradle
494494
path: ./
495495
target: ':instrumentation:graphql-java:graphql-java-12.0:javaagent'

‎.github/config/flint.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
[settings]
22
exclude = ["CHANGELOG.md", "licenses/licenses.md"]
3-
setup_migration_version = 2
43

54
[checks.lychee]
65
check_all_local = true

‎.github/scripts/check-package-names.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,10 @@ for dir in $(find instrumentation -name "*.java" | grep library/src/main/java |
3535
# - jdbc
3636
# - lettuce-common
3737
# - netty-common
38-
# - oshi
3938
# - resources
4039
# - servlet-common
4140
# - servlet-common-javax
42-
if [[ ! "$module_name" =~ [0-9]$ && "$module_name" != "jdbc" && "$module_name" != "lettuce-common" && "$module_name" != "netty-common" && "$module_name" != "oshi" && "$module_name" != "resources" && "$module_name" != "servlet-common" && "$module_name" != "servlet-common-javax" ]]; then
41+
if [[ ! "$module_name" =~ [0-9]$ && "$module_name" != "jdbc" && "$module_name" != "lettuce-common" && "$module_name" != "netty-common" && "$module_name" != "resources" && "$module_name" != "servlet-common" && "$module_name" != "servlet-common-javax" ]]; then
4342
echo "module name doesn't have a base version: $dir"
4443
exit 1
4544
fi

‎.github/scripts/instrumentations.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,8 @@ readonly INSTRUMENTATIONS=(
208208
"opensearch:opensearch-rest-3.0:javaagent:testStableSemconv"
209209
"oracle-ucp-11.2:javaagent:test"
210210
"oracle-ucp-11.2:javaagent:testStableSemconv"
211-
"oshi:javaagent:test"
212-
"oshi:javaagent:testExperimental"
211+
"oshi-5.0:javaagent:test"
212+
"oshi-5.0:javaagent:testExperimental"
213213
"pekko:pekko-http-1.0:javaagent:test"
214214
"play:play-mvc:play-mvc-2.4:javaagent:test"
215215
"play:play-mvc:play-mvc-2.6:javaagent:check"

‎.github/workflows/pr-review-dashboard.yml‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,30 @@ jobs:
4949
run: |
5050
set -euo pipefail
5151
52-
number=$(gh api \
53-
--paginate \
54-
"repos/$GITHUB_REPOSITORY/issues?state=open&labels=$DASHBOARD_LABEL&per_page=100" \
55-
--jq '.[] | select(.pull_request == null and .title == env.DASHBOARD_TITLE) | .number' \
56-
| sort -n \
52+
# Use GraphQL instead of the REST `/repos/{repo}/issues` list
53+
# endpoint because that endpoint has been observed to omit pinned
54+
# issues from its results, which would cause this step to create a
55+
# duplicate dashboard issue instead of updating the existing one.
56+
owner="${GITHUB_REPOSITORY%/*}"
57+
name="${GITHUB_REPOSITORY#*/}"
58+
number=$(gh api graphql --paginate \
59+
-F owner="$owner" -F name="$name" -F label="$DASHBOARD_LABEL" \
60+
-f query='
61+
query ($owner: String!, $name: String!, $label: String!, $endCursor: String) {
62+
repository(owner: $owner, name: $name) {
63+
issues(
64+
first: 100
65+
after: $endCursor
66+
states: OPEN
67+
filterBy: { labels: [$label] }
68+
orderBy: { field: CREATED_AT, direction: ASC }
69+
) {
70+
pageInfo { hasNextPage endCursor }
71+
nodes { number title }
72+
}
73+
}
74+
}' \
75+
--jq ".data.repository.issues.nodes[] | select(.title == \"$DASHBOARD_TITLE\") | .number" \
5776
| sed -n '1p')
5877
5978
if [[ -n "$number" ]]; then

‎benchmark-overhead/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id("java")
3-
id("com.diffplug.spotless") version "8.5.1"
3+
id("com.diffplug.spotless") version "8.6.0"
44
}
55

66
spotless {

‎conventions/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
`kotlin-dsl`
33
// When updating, update below in dependencies too
4-
id("com.diffplug.spotless") version "8.5.1"
4+
id("com.diffplug.spotless") version "8.6.0"
55
}
66

77
spotless {
@@ -54,7 +54,7 @@ dependencies {
5454
implementation("org.apache.maven:maven-aether-provider:3.3.9")
5555

5656
// When updating, update above in plugins too
57-
implementation("com.diffplug.spotless:spotless-plugin-gradle:8.5.1")
57+
implementation("com.diffplug.spotless:spotless-plugin-gradle:8.6.0")
5858
implementation("com.google.guava:guava:33.6.0-jre")
5959
implementation("com.gradleup.shadow:shadow-gradle-plugin:9.4.1") {
6060
// plexus-xml 4.1+ pulls in Maven 4 API which uses JPMS-only service registration,

‎docs/instrumentation-list.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11393,7 +11393,7 @@ libraries:
1139311393
semantic_conventions:
1139411394
- SYSTEM_METRICS
1139511395
library_link: https://github.com/oshi/oshi/
11396-
source_path: instrumentation/oshi
11396+
source_path: instrumentation/oshi-5.0
1139711397
scope:
1139811398
name: io.opentelemetry.oshi
1139911399
has_standalone_library: true

‎docs/supported-libraries.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ These are the supported libraries and frameworks:
120120
| [OpenSearch Rest Client](https://github.com/opensearch-project/opensearch-java) | 1.0+ | | [Database Client Spans], [Database Client Metrics] [6] |
121121
| [OkHttp](https://github.com/square/okhttp/) | 2.2+ | [opentelemetry-okhttp-3.0](../instrumentation/okhttp/okhttp-3.0/library) | [HTTP Client Spans], [HTTP Client Metrics] |
122122
| [Oracle UCP](https://docs.oracle.com/database/121/JJUCP/) | 11.2+ | [opentelemetry-oracle-ucp-11.2](../instrumentation/oracle-ucp-11.2/library) | [Database Pool Metrics] |
123-
| [OSHI](https://github.com/oshi/oshi/) | 5.3.1+ | [opentelemetry-oshi](../instrumentation/oshi/library) | [System Metrics] (partial support) |
123+
| [OSHI](https://github.com/oshi/oshi/) | 5.3.1+ | [opentelemetry-oshi](../instrumentation/oshi-5.0/library) | [System Metrics] (partial support) |
124124
| [Play MVC](https://github.com/playframework/playframework) | 2.4+ | N/A | Provides `http.route` [2], Controller Spans [3] |
125125
| [Play WS](https://github.com/playframework/play-ws) | 1.0+ | N/A | [HTTP Client Spans], [HTTP Client Metrics] |
126126
| [PowerJob](http://www.powerjob.tech/) | 4.0.0+ | N/A | none |

‎examples/distro/buildSrc/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ repositories {
88
}
99

1010
dependencies {
11-
implementation("com.diffplug.spotless:spotless-plugin-gradle:8.5.1")
11+
implementation("com.diffplug.spotless:spotless-plugin-gradle:8.6.0")
1212
implementation("com.gradleup.shadow:shadow-gradle-plugin:9.4.1")
1313
}

0 commit comments

Comments
 (0)