Skip to content

Commit 7db1a8e

Browse files
Abhishekkr3003Abhishekkr3003
committed
Merge branch 'main' into aerospike-client-instrumentation
2 parents da8a59e + 4f94664 commit 7db1a8e

File tree

93 files changed

+2135
-1726
lines changed

Some content is hidden

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

93 files changed

+2135
-1726
lines changed

‎.github/repository-settings.md

+9-2
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,22 @@ for [`dependabot/**/**`](https://github.com/open-telemetry/community/blob/main/d
6464

6565
## Secrets and variables > Actions
6666

67+
### Repository secrets
68+
6769
- `GPG_PASSWORD` - stored in OpenTelemetry-Java 1Password
6870
- `GPG_PRIVATE_KEY` - stored in OpenTelemetry-Java 1Password
6971
- `GRADLE_ENTERPRISE_ACCESS_KEY` - owned by [@trask](https://github.com/trask)
7072
- Generated at https://ge.opentelemetry.io > My settings > Access keys
71-
- format of env var is `ge.opentelemetry.io=<access key>`,
73+
- Format of env var is `ge.opentelemetry.io=<access key>`,
7274
see [docs](https://docs.gradle.com/enterprise/gradle-plugin/#via_environment_variable)
7375
- `GRADLE_PUBLISH_KEY`
7476
- `GRADLE_PUBLISH_SECRET`
7577
- `NVD_API_KEY` - stored in OpenTelemetry-Java 1Password
76-
- `OPENTELEMETRYBOT_GITHUB_TOKEN` - owned by [@trask](https://github.com/trask)
78+
- Generated at https://nvd.nist.gov/developers/request-an-api-key
79+
- Key is associated with [@trask](https://github.com/trask)'s gmail address
7780
- `SONATYPE_KEY` - owned by [@trask](https://github.com/trask)
7881
- `SONATYPE_USER` - owned by [@trask](https://github.com/trask)
82+
83+
### Organization secrets
84+
85+
- `OPENTELEMETRYBOT_GITHUB_TOKEN`

‎.github/workflows/auto-update-otel-sdk.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
java-version-file: .java-version
7373

7474
- name: Setup Gradle
75-
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
75+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
7676

7777
- name: Update license report
7878
run: ./gradlew generateLicenseReport

‎.github/workflows/build-common.yml

+9-11
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
java-version-file: .java-version
3939

4040
- name: Setup Gradle
41-
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
41+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
4242
with:
4343
cache-read-only: ${{ inputs.cache-read-only }}
4444
# gradle enterprise is used for the build cache
@@ -54,7 +54,7 @@ jobs:
5454
steps:
5555
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5656

57-
- uses: gradle/actions/wrapper-validation@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
57+
- uses: gradle/actions/wrapper-validation@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
5858

5959
license-check:
6060
runs-on: ubuntu-latest
@@ -71,7 +71,7 @@ jobs:
7171
java-version-file: .java-version
7272

7373
- name: Setup Gradle
74-
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
74+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
7575
with:
7676
cache-read-only: ${{ inputs.cache-read-only }}
7777
# gradle enterprise is used for the build cache
@@ -80,9 +80,7 @@ jobs:
8080
- name: Generate license report
8181
env:
8282
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
83-
# currently ignoring inputs.no-build-cache and always running with --no-build-cache
84-
# see https://github.com/jk1/Gradle-License-Report/issues/231
85-
run: ./gradlew generateLicenseReport --no-build-cache
83+
run: ./gradlew generateLicenseReport ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
8684

8785
- name: Check licenses
8886
run: |
@@ -144,7 +142,7 @@ jobs:
144142
sed -i "s/org.gradle.jvmargs=/org.gradle.jvmargs=-Xmx3g /" gradle.properties
145143
146144
- name: Setup Gradle
147-
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
145+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
148146
with:
149147
cache-read-only: ${{ inputs.cache-read-only }}
150148
# gradle enterprise is used for the build cache
@@ -247,7 +245,7 @@ jobs:
247245
run: .github/scripts/deadlock-detector.sh
248246

249247
- name: Setup Gradle
250-
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
248+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
251249
with:
252250
# only push cache for one matrix option since github action cache space is limited
253251
cache-read-only: ${{ inputs.cache-read-only || matrix.test-java-version != 11 || matrix.vm != 'hotspot' }}
@@ -346,7 +344,7 @@ jobs:
346344
java-version-file: .java-version
347345

348346
- name: Set up Gradle cache
349-
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
347+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
350348
with:
351349
# only push cache for one matrix option per OS since github action cache space is limited
352350
cache-read-only: ${{ inputs.cache-read-only || matrix.smoke-test-suite != 'tomcat' }}
@@ -399,7 +397,7 @@ jobs:
399397
java-version-file: .java-version
400398

401399
- name: Setup Gradle
402-
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
400+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
403401
with:
404402
cache-read-only: ${{ inputs.cache-read-only }}
405403

@@ -422,7 +420,7 @@ jobs:
422420
java-version-file: .java-version
423421

424422
- name: Set up Gradle cache
425-
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
423+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
426424
with:
427425
cache-read-only: ${{ inputs.cache-read-only }}
428426

‎.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
java-version-file: .java-version
7474

7575
- name: Setup Gradle
76-
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
76+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
7777
with:
7878
# gradle enterprise is used for the build cache
7979
gradle-home-cache-excludes: caches/build-cache-1

‎.github/workflows/codeql-daily.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,22 @@ jobs:
3030
java-version-file: .java-version
3131

3232
- name: Initialize CodeQL
33-
uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
33+
uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
3434
with:
3535
languages: java
3636
# using "latest" helps to keep up with the latest Kotlin support
3737
# see https://github.com/github/codeql-action/issues/1555#issuecomment-1452228433
3838
tools: latest
3939

4040
- name: Setup Gradle
41-
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
41+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
4242

4343
- name: Build
4444
# skipping build cache is needed so that all modules will be analyzed
4545
run: ./gradlew assemble -x javadoc --no-build-cache --no-daemon
4646

4747
- name: Perform CodeQL analysis
48-
uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
48+
uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
4949

5050
workflow-notification:
5151
needs:

‎.github/workflows/overhead-benchmark-daily.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
rsync -avv gh-pages/benchmark-overhead/results/ benchmark-overhead/results/
2525
2626
- name: Setup Gradle
27-
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
27+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
2828

2929
- name: Run tests
3030
working-directory: benchmark-overhead

‎.github/workflows/owasp-dependency-check-daily.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
run: |
2929
sed -i "s/org.gradle.jvmargs=/org.gradle.jvmargs=-Xmx3g /" gradle.properties
3030
31-
- uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
31+
- uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
3232

3333
- run: ./gradlew :javaagent:dependencyCheckAnalyze
3434
env:

‎.github/workflows/pr-smoke-test-early-jdk8-images.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
java-version-file: .java-version
2626

2727
- name: Setup Gradle
28-
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
28+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
2929
with:
3030
cache-read-only: true
3131
# gradle enterprise is used for the build cache

‎.github/workflows/pr-smoke-test-fake-backend-images.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
java-version-file: .java-version
2626

2727
- name: Setup Gradle
28-
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
28+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
2929
with:
3030
cache-read-only: true
3131
# gradle enterprise is used for the build cache
@@ -52,7 +52,7 @@ jobs:
5252
java-version-file: .java-version
5353

5454
- name: Setup Gradle
55-
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
55+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
5656
with:
5757
cache-read-only: true
5858

‎.github/workflows/pr-smoke-test-servlet-images.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
java-version-file: .java-version
4444

4545
- name: Set up Gradle cache
46-
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
46+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
4747
with:
4848
cache-read-only: true
4949

‎.github/workflows/publish-smoke-test-early-jdk8-images.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
run: echo "TAG=$(date '+%Y%m%d').$GITHUB_RUN_ID" >> $GITHUB_ENV
3636

3737
- name: Setup Gradle
38-
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
38+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
3939

4040
- name: Build Docker image
4141
run: ./gradlew :smoke-tests:images:early-jdk8:dockerPush -PextraTag=${{ env.TAG }}

‎.github/workflows/publish-smoke-test-fake-backend-images.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
run: echo "TAG=$(date '+%Y%m%d').$GITHUB_RUN_ID" >> $GITHUB_ENV
3636

3737
- name: Setup Gradle
38-
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
38+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
3939

4040
- name: Build Docker image
4141
run: ./gradlew :smoke-tests:images:fake-backend:jib -Djib.httpTimeout=120000 -Djib.console=plain -PextraTag=${{ env.TAG }}
@@ -68,7 +68,7 @@ jobs:
6868
run: echo "TAG=$(date '+%Y%m%d').$GITHUB_RUN_ID" >> $GITHUB_ENV
6969

7070
- name: Setup Gradle
71-
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
71+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
7272

7373
- name: Build Docker image
7474
run: ./gradlew :smoke-tests:images:fake-backend:dockerPush -PextraTag=${{ env.TAG }}

‎.github/workflows/publish-smoke-test-servlet-images.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
password: ${{ secrets.GITHUB_TOKEN }}
6868

6969
- name: Set up Gradle cache
70-
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
70+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
7171
with:
7272
# only push cache for one matrix option per OS since github action cache space is limited
7373
cache-read-only: ${{ matrix.smoke-test-suite != 'tomcat' }}

‎.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
java-version-file: .java-version
8888

8989
- name: Setup Gradle
90-
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
90+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
9191

9292
- name: Build and publish artifacts
9393
env:

‎.github/workflows/reusable-muzzle.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
java-version-file: .java-version
3535

3636
- name: Setup Gradle
37-
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
37+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
3838
with:
3939
cache-read-only: ${{ inputs.cache-read-only }}
4040

‎.github/workflows/reusable-smoke-test-images.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
run: echo "TAG=$(date '+%Y%m%d').$GITHUB_RUN_ID" >> $GITHUB_ENV
6565

6666
- name: Set up Gradle cache
67-
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
67+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
6868
with:
6969
cache-read-only: ${{ inputs.cache-read-only }}
7070

‎.github/workflows/reusable-test-indy.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
key: ${{ runner.os }}-test-latest-cache-pnpm-modules
5959

6060
- name: Setup Gradle
61-
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
61+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
6262
with:
6363
cache-read-only: ${{ inputs.cache-read-only }}
6464
# gradle enterprise is used for the build cache

‎.github/workflows/reusable-test-latest-deps.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
run: .github/scripts/deadlock-detector.sh
5656

5757
- name: Setup Gradle
58-
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
58+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
5959
with:
6060
cache-read-only: ${{ inputs.cache-read-only }}
6161
# gradle enterprise is used for the build cache

‎.github/workflows/scorecard.yml

+1-1
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@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
67+
uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
6868
with:
6969
sarif_file: results.sarif

‎benchmark-overhead-jmh/build.gradle.kts

+6-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,13 @@ plugins {
77
id("otel.jmh-conventions")
88
}
99

10+
otelJava {
11+
// Spring Boot 3 requires java 17
12+
minJavaVersionSupported.set(JavaVersion.VERSION_17)
13+
}
14+
1015
dependencies {
11-
jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.3.5")
16+
jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.4.0")
1217
}
1318

1419
tasks {

‎benchmark-overhead/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ repositories {
1818
dependencies {
1919
implementation(enforcedPlatform("org.junit:junit-bom:5.11.3"))
2020

21-
testImplementation("org.testcontainers:testcontainers:1.20.3")
22-
testImplementation("org.testcontainers:postgresql:1.20.3")
21+
testImplementation("org.testcontainers:testcontainers:1.20.4")
22+
testImplementation("org.testcontainers:postgresql:1.20.4")
2323
testImplementation("org.junit.jupiter:junit-jupiter-api")
2424
testImplementation("org.junit.jupiter:junit-jupiter-params")
2525
testImplementation("com.squareup.okhttp3:okhttp:4.12.0")

‎benchmark-overhead/gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=57dafb5c2622c6cc08b993c85b7c06956a2f53536432a30ead46166dbca0f1e9
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
3+
distributionSha256Sum=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

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

-5
Original file line numberDiff line numberDiff line change
@@ -280,11 +280,6 @@ tasks {
280280
charSet = "UTF-8"
281281
breakIterator(true)
282282

283-
// TODO (trask) revisit to see if url is fixed
284-
// currently broken because https://docs.oracle.com/javase/8/docs/api/element-list is missing
285-
// and redirects
286-
// links("https://docs.oracle.com/javase/8/docs/api/")
287-
288283
addStringOption("Xdoclint:none", "-quiet")
289284
// non-standard option to fail on warnings, see https://bugs.openjdk.java.net/browse/JDK-8200363
290285
addStringOption("Xwerror", "-quiet")

‎dependencyManagement/build.gradle.kts

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ rootProject.extra["versions"] = dependencyVersions
99

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

1515
// Need both BOM and groovy jars
@@ -34,7 +34,7 @@ val DEPENDENCY_BOMS = listOf(
3434
"io.opentelemetry:opentelemetry-bom:${otelSdkVersion}",
3535
"io.opentelemetry:opentelemetry-bom-alpha:${otelSdkAlphaVersion}",
3636
"org.junit:junit-bom:5.11.3",
37-
"org.testcontainers:testcontainers-bom:1.20.3",
37+
"org.testcontainers:testcontainers-bom:1.20.4",
3838
"org.spockframework:spock-bom:2.4-M4-groovy-4.0"
3939
)
4040

@@ -103,7 +103,7 @@ val DEPENDENCIES = listOf(
103103
"io.opentelemetry.contrib:opentelemetry-aws-xray-propagator:${otelContribVersion}",
104104
"io.opentelemetry.contrib:opentelemetry-gcp-resources:${otelContribVersion}",
105105
"io.opentelemetry.contrib:opentelemetry-baggage-processor:${otelContribVersion}",
106-
"io.opentelemetry.proto:opentelemetry-proto:1.3.2-alpha",
106+
"io.opentelemetry.proto:opentelemetry-proto:1.4.0-alpha",
107107
"io.opentelemetry:opentelemetry-extension-annotations:1.18.0", // deprecated, no longer part of bom
108108
"org.assertj:assertj-core:3.26.3",
109109
"org.awaitility:awaitility:4.2.2",

‎docs/contributing/style-guideline.md

+1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ rough guideline of what are commonly accepted static imports:
6666
- Immutable constants (where clearly named)
6767
- Singleton instances (especially where clearly named and hopefully immutable)
6868
- `tracer()` methods that expose tracer singleton instances
69+
- Semantic convention attribute keys used in tests
6970

7071
Some of these are enforced by checkstyle rules:
7172

0 commit comments

Comments
 (0)