Skip to content

Commit 67b717e

Browse files
committed
Auto-update Java (open-telemetry#7572)
1 parent 129c0e0 commit 67b717e

File tree

8 files changed

+22
-69
lines changed

8 files changed

+22
-69
lines changed

.github/renovate.json5

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,17 @@
8383
enabled: false
8484
}
8585
],
86+
customManagers: [
87+
{
88+
customType: 'regex',
89+
datasourceTemplate: 'java-version',
90+
managerFilePatterns: [
91+
'.github/workflows/**'
92+
],
93+
matchStrings: [
94+
'(?<currentValue>\\d+) # renovate: datasource=java-version',
95+
],
96+
depNameTemplate: 'java',
97+
},
98+
],
8699
}

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ jobs:
3737
- 11
3838
- 17
3939
- 21
40-
- 23
40+
- 23 # renovate: datasource=java-version
4141
# Collect coverage on latest LTS
4242
include:
4343
- os: ubuntu-latest
4444
test-java-version: 21
4545
coverage: true
4646
jmh-based-tests: true
47-
# macos-latest drops support for java 8 temurin. Run java 8 on macos-13. Run java 11, 17, 21 on macos-latest.
47+
# macos-latest drops support for java 8 temurin. Run java 8 on macos-13. Run java 11+ on macos-latest.
4848
exclude:
4949
- os: macos-latest
5050
test-java-version: 8
@@ -55,7 +55,7 @@ jobs:
5555
- os: macos-13
5656
test-java-version: 21
5757
- os: macos-13
58-
test-java-version: 23
58+
test-java-version: 23 # renovate: datasource=java-version
5959
steps:
6060
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
6161

.github/workflows/docker-test-containers-daily.yml

Lines changed: 0 additions & 55 deletions
This file was deleted.

exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/CollectorIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
class CollectorIntegrationTest {
6161

6262
private static final String COLLECTOR_IMAGE =
63-
"ghcr.io/open-telemetry/opentelemetry-java/otel-collector" + collectorVersion();
63+
"otel/opentelemetry-collector-contrib" + collectorVersion();
6464

6565
private static String collectorVersion() {
6666
String otelCollectorVersion = System.getenv("OTEL_COLLECTOR_VERSION");

integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ abstract class OtlpExporterIntegrationTest {
115115
private static final AttributeKey<String> SERVICE_NAME = AttributeKey.stringKey("service.name");
116116

117117
private static final String COLLECTOR_IMAGE =
118-
"ghcr.io/open-telemetry/opentelemetry-java/otel-collector" + collectorVersion();
118+
"otel/opentelemetry-collector-contrib" + collectorVersion();
119119

120120
private static String collectorVersion() {
121121
String otelCollectorVersion = System.getenv("OTEL_COLLECTOR_VERSION");

integration-tests/tracecontext/src/test/java/io/opentelemetry/integrationtests/tracecontext/TraceContextIntegrationTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ class TraceContextIntegrationTest {
2424

2525
@Container
2626
private static final GenericContainer<?> appContainer =
27-
new GenericContainer<>(
28-
DockerImageName.parse("ghcr.io/open-telemetry/opentelemetry-java/openjdk17"))
27+
new GenericContainer<>(DockerImageName.parse("eclipse-temurin:17-jre-focal"))
2928
.withExposedPorts(5000)
3029
.withNetwork(Network.SHARED)
3130
.withNetworkAliases("app")

perf-harness/src/test/java/io/opentelemetry/perf/OtlpPipelineStressTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@ public class OtlpPipelineStressTest {
6868

6969
@Container
7070
public static final GenericContainer<?> collectorContainer =
71-
new GenericContainer<>(
72-
DockerImageName.parse("ghcr.io/open-telemetry/opentelemetry-java/otel-collector"))
71+
new GenericContainer<>(DockerImageName.parse("otel/opentelemetry-collector-contrib:latest"))
7372
.withImagePullPolicy(PullPolicy.alwaysPull())
7473
.withNetwork(network)
7574
.withNetworkAliases("otel-collector")
@@ -94,8 +93,7 @@ public class OtlpPipelineStressTest {
9493

9594
@Container
9695
public static final GenericContainer<?> toxiproxyContainer =
97-
new GenericContainer<>(
98-
DockerImageName.parse("ghcr.io/open-telemetry/opentelemetry-java/toxiproxy"))
96+
new GenericContainer<>(DockerImageName.parse("shopify/toxiproxy:latest"))
9997
.withImagePullPolicy(PullPolicy.alwaysPull())
10098
.withNetwork(network)
10199
.withNetworkAliases("toxiproxy")

sdk-extensions/jaeger-remote-sampler/src/test/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/JaegerRemoteSamplerIntegrationTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.testcontainers.containers.BindMode;
2121
import org.testcontainers.containers.GenericContainer;
2222
import org.testcontainers.containers.wait.strategy.Wait;
23-
import org.testcontainers.images.PullPolicy;
2423
import org.testcontainers.junit.jupiter.Container;
2524
import org.testcontainers.junit.jupiter.Testcontainers;
2625

@@ -36,8 +35,7 @@ class JaegerRemoteSamplerIntegrationTest {
3635

3736
@Container
3837
public static final GenericContainer<?> jaegerContainer =
39-
new GenericContainer<>("ghcr.io/open-telemetry/opentelemetry-java/jaeger:1.32")
40-
.withImagePullPolicy(PullPolicy.alwaysPull())
38+
new GenericContainer<>("jaegertracing/all-in-one:1.32")
4139
.withCommand("--sampling.strategies-file=/sampling.json")
4240
.withExposedPorts(COLLECTOR_PORT, QUERY_PORT, HEALTH_PORT)
4341
.waitingFor(Wait.forHttp("/").forPort(HEALTH_PORT))

0 commit comments

Comments
 (0)