Skip to content

Commit 844a3d1

Browse files
bryan-aguilarbryan-aguilar
authored
[release/v1.28.x] backport okio-bom version bump to otel-java (#486)
* backport okio-bom version bump to otel-java * fix patch files * Fix patch files and versions * Add java inst to versions * Fix versions file * fix inst patch * Add moar powwaaa * Setup tests for Vaadin
1 parent eaf370a commit 844a3d1

File tree

6 files changed

+131
-3
lines changed

6 files changed

+131
-3
lines changed

‎.github/patches/release/v1.28.x/opentelemetry-java-instrumentation.patch

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
commit 9ad7e335023493544a02128c75f5ba12532a92eb
2+
Author: Bryan Aguilar <[email protected]>
3+
Date: Fri Jul 28 11:08:04 2023 -0700
4+
5+
Patch instrumentation versions
6+
7+
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
8+
index 39d3c109c2..0caba721a6 100644
9+
--- a/dependencyManagement/build.gradle.kts
10+
+++ b/dependencyManagement/build.gradle.kts
11+
@@ -12,7 +12,7 @@ val dependencyVersions = hashMapOf<String, String>()
12+
rootProject.extra["versions"] = dependencyVersions
13+
14+
// this line is managed by .github/scripts/update-sdk-version.sh
15+
-val otelSdkVersion = "1.28.0"
16+
+val otelSdkVersion = "1.28.0-adot1"
17+
val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
18+
19+
// Need both BOM and groovy jars
20+
diff --git a/examples/distro/build.gradle b/examples/distro/build.gradle
21+
index 9a97747771..2dd29a055f 100644
22+
--- a/examples/distro/build.gradle
23+
+++ b/examples/distro/build.gradle
24+
@@ -27,7 +27,7 @@ subprojects {
25+
ext {
26+
versions = [
27+
// this line is managed by .github/scripts/update-sdk-version.sh
28+
- opentelemetrySdk : "1.28.0",
29+
+ opentelemetrySdk : "1.28.0-adot1",
30+
31+
// these lines are managed by .github/scripts/update-version.sh
32+
opentelemetryJavaagent : "1.28.0",
33+
diff --git a/examples/extension/build.gradle b/examples/extension/build.gradle
34+
index 1c25a1e530..39000803bf 100644
35+
--- a/examples/extension/build.gradle
36+
+++ b/examples/extension/build.gradle
37+
@@ -23,7 +23,7 @@ version '1.0'
38+
ext {
39+
versions = [
40+
// this line is managed by .github/scripts/update-sdk-version.sh
41+
- opentelemetrySdk : "1.28.0",
42+
+ opentelemetrySdk : "1.28.0-adot1",
43+
44+
// these lines are managed by .github/scripts/update-version.sh
45+
opentelemetryJavaagent : "1.28.0",
46+
diff --git a/version.gradle.kts b/version.gradle.kts
47+
index cc1414c0bf..c7b1ea682e 100644
48+
--- a/version.gradle.kts
49+
+++ b/version.gradle.kts
50+
@@ -1,5 +1,5 @@
51+
-val stableVersion = "1.28.0"
52+
-val alphaVersion = "1.28.0-alpha"
53+
+val stableVersion = "1.28.0-adot1"
54+
+val alphaVersion = "1.28.0-adot1-alpha"
55+
56+
allprojects {
57+
if (findProperty("otel.stable") != "true") {

‎.github/patches/release/v1.28.x/opentelemetry-java.patch

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
commit 063d3b802112265f64151fb9625d6d6a5b68c7cf
2+
Author: Bryan Aguilar <[email protected]>
3+
Date: Fri Jul 28 10:05:22 2023 -0700
4+
5+
Patch okio and bump version
6+
7+
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
8+
index 917446df7..df564c863 100644
9+
--- a/dependencyManagement/build.gradle.kts
10+
+++ b/dependencyManagement/build.gradle.kts
11+
@@ -17,7 +17,7 @@ val DEPENDENCY_BOMS = listOf(
12+
"com.google.protobuf:protobuf-bom:3.23.4",
13+
"com.linecorp.armeria:armeria-bom:1.24.2",
14+
"com.squareup.okhttp3:okhttp-bom:4.11.0",
15+
- "com.squareup.okio:okio-bom:3.3.0", // applies to transitive dependencies of okhttp
16+
+ "com.squareup.okio:okio-bom:3.4.0", // applies to transitive dependencies of okhttp
17+
"io.grpc:grpc-bom:1.56.1",
18+
"io.netty:netty-bom:4.1.94.Final",
19+
"io.zipkin.brave:brave-bom:5.16.0",
20+
diff --git a/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkSpanBuilderTest.java b/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkSpanBuilderTest.java
21+
index 461ed774c..560706305 100644
22+
--- a/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkSpanBuilderTest.java
23+
+++ b/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkSpanBuilderTest.java
24+
@@ -991,7 +991,7 @@ class SdkSpanBuilderTest {
25+
+ "resource=Resource\\{schemaUrl=null, "
26+
+ "attributes=\\{service.name=\"unknown_service:java\", "
27+
+ "telemetry.sdk.language=\"java\", telemetry.sdk.name=\"opentelemetry\", "
28+
- + "telemetry.sdk.version=\"\\d+.\\d+.\\d+(-rc.\\d+)?(-SNAPSHOT)?\"}}, "
29+
+ + "telemetry.sdk.version=\"\\d+.\\d+.\\d+(-rc.\\d+)?(-[a-zA-Z0-9]+)?\"}}, "
30+
+ "instrumentationScopeInfo=InstrumentationScopeInfo\\{"
31+
+ "name=SpanBuilderSdkTest, version=null, schemaUrl=null, attributes=\\{}}, "
32+
+ "name=span_name, "
33+
diff --git a/version.gradle.kts b/version.gradle.kts
34+
index 1e1986816..32fb83632 100644
35+
--- a/version.gradle.kts
36+
+++ b/version.gradle.kts
37+
@@ -1,7 +1,7 @@
38+
val snapshot = false
39+
40+
allprojects {
41+
- var ver = "1.28.0"
42+
+ var ver = "1.28.0-adot1"
43+
val release = findProperty("otel.release")
44+
if (release != null) {
45+
ver += "-" + release

‎.github/patches/release/v1.28.x/versions

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
OTEL_JAVA_VERSION=v1.28.0
2+
OTEL_JAVA_INSTRUMENTATION_VERSION=v1.28.0

‎.github/workflows/main-build.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,26 @@ permissions:
2020
jobs:
2121
testpatch:
2222
name: Test patches applied to dependencies
23-
runs-on: ubuntu-latest
23+
runs-on: temporary-sizing-testing_ubuntu-latest_64-core
2424
if: ${{ startsWith(github.ref_name, 'release/v') }}
2525
steps:
2626
- uses: actions/checkout@v3
2727
- uses: actions/setup-java@v3
2828
with:
2929
java-version: 17
3030
distribution: temurin
31+
# vaadin 14 tests fail with node 18
32+
- name: Set up Node
33+
uses: actions/setup-node@v3
34+
with:
35+
node-version: 16
36+
37+
# vaadin tests use pnpm
38+
- name: Cache pnpm modules
39+
uses: actions/cache@v3
40+
with:
41+
path: ~/.pnpm-store
42+
key: ${{ runner.os }}-test-cache-pnpm-modules
3143
- uses: gradle/wrapper-validation-action@v1
3244
- uses: ./.github/actions/patch-dependencies
3345
with:

‎.github/workflows/pr-build.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
jobs:
1111
testpatch:
1212
name: Test patches applied to dependencies
13-
runs-on: ubuntu-latest
13+
runs-on: temporary-sizing-testing_ubuntu-latest_64-core
1414
if: ${{ startsWith(github.event.pull_request.base.ref, 'release/v') }}
1515
steps:
1616
- uses: actions/checkout@v3
@@ -19,6 +19,18 @@ jobs:
1919
with:
2020
java-version: 17
2121
distribution: temurin
22+
# vaadin 14 tests fail with node 18
23+
- name: Set up Node
24+
uses: actions/setup-node@v3
25+
with:
26+
node-version: 16
27+
28+
# vaadin tests use pnpm
29+
- name: Cache pnpm modules
30+
uses: actions/cache@v3
31+
with:
32+
path: ~/.pnpm-store
33+
key: ${{ runner.os }}-test-cache-pnpm-modules
2234

2335
- uses: gradle/wrapper-validation-action@v1
2436

‎dependencyManagement/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ data class DependencySet(val group: String, val version: String, val modules: Li
2727
val TEST_SNAPSHOTS = rootProject.findProperty("testUpstreamSnapshots") == "true"
2828

2929
// This is the version of the upstream instrumentation BOM
30-
val otelVersion = "1.28.0"
30+
val otelVersion = "1.28.0-adot1"
3131
val otelSnapshotVersion = "1.29.0"
3232

3333
// All versions below are only used in testing and do not affect the released artifact.

0 commit comments

Comments
 (0)