Skip to content

Commit 83550c8

Browse files
trasklaurit
andauthored
Fix the build (#2193)
Co-authored-by: Lauri Tulmin <[email protected]>
1 parent 1ac0bcf commit 83550c8

File tree

4 files changed

+15
-19
lines changed

4 files changed

+15
-19
lines changed

.github/renovate.json5

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,5 +202,15 @@
202202
depNameTemplate: 'java',
203203
extractVersionTemplate: '^(?<version>\\d+)',
204204
},
205+
{
206+
customType: 'regex',
207+
datasourceTemplate: 'github-releases',
208+
managerFilePatterns: [
209+
'**/build.gradle.kts',
210+
],
211+
matchStrings: [
212+
'"https://github.com/(?<depName>[^/]+/[^/]+)/zipball/(?<currentValue>.+?)"',
213+
],
214+
},
205215
],
206216
}

jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/KafkaIntegrationTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ protected KafkaIntegrationTest(String configName) {
4444

4545
@Container
4646
GenericContainer<?> kafka =
47-
new GenericContainer<>("bitnami/kafka:2.8.1")
47+
new GenericContainer<>("bitnamilegacy/kafka:2.8.1")
4848
.withNetwork(Network.SHARED)
4949
.withEnv("KAFKA_CFG_ZOOKEEPER_CONNECT", "zookeeper:2181")
5050
.withEnv("ALLOW_PLAINTEXT_LISTENER", "yes")
@@ -80,7 +80,7 @@ public Set<Startable> getDependencies() {
8080
};
8181

8282
protected GenericContainer<?> kafkaProducerContainer() {
83-
return new GenericContainer<>("bitnami/kafka:2.8.1")
83+
return new GenericContainer<>("bitnamilegacy/kafka:2.8.1")
8484
.withNetwork(Network.SHARED)
8585
.withEnv("KAFKA_CFG_ZOOKEEPER_CONNECT", "zookeeper:2181")
8686
.withEnv("ALLOW_PLAINTEXT_LISTENER", "yes")
@@ -207,7 +207,7 @@ static class KafkaConsumerIntegrationTest extends KafkaIntegrationTest {
207207

208208
@Container
209209
GenericContainer<?> consumer =
210-
new GenericContainer<>("bitnami/kafka:2.8.1")
210+
new GenericContainer<>("bitnamilegacy/kafka:2.8.1")
211211
.withNetwork(Network.SHARED)
212212
.withEnv("KAFKA_CFG_ZOOKEEPER_CONNECT", "zookeeper:2181")
213213
.withEnv("ALLOW_PLAINTEXT_LISTENER", "yes")

jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/kafka/KafkaContainerFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
public class KafkaContainerFactory {
1313
private static final int KAFKA_PORT = 9092;
1414
private static final String KAFKA_BROKER = "kafka:" + KAFKA_PORT;
15-
private static final String KAFKA_DOCKER_IMAGE = "bitnami/kafka:2.8.1";
15+
private static final String KAFKA_DOCKER_IMAGE = "bitnamilegacy/kafka:2.8.1";
1616

1717
private KafkaContainerFactory() {}
1818

opamp-client/build.gradle.kts

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import de.undercouch.gradle.tasks.download.DownloadExtension
2-
import java.net.HttpURLConnection
3-
import java.net.URL
42

53
plugins {
64
id("otel.java-conventions")
@@ -53,19 +51,7 @@ abstract class DownloadOpampProtos @Inject constructor(
5351

5452
@TaskAction
5553
fun execute() {
56-
// Get the latest release tag by following the redirect from GitHub's latest release URL
57-
val latestReleaseUrl = "https://github.com/open-telemetry/opamp-spec/releases/latest"
58-
val connection = URL(latestReleaseUrl).openConnection() as HttpURLConnection
59-
connection.instanceFollowRedirects = false
60-
connection.requestMethod = "HEAD"
61-
62-
val redirectLocation = connection.getHeaderField("Location")
63-
connection.disconnect()
64-
65-
// Extract tag from URL like: https://github.com/open-telemetry/opamp-spec/releases/tag/v0.12.0
66-
val latestTag = redirectLocation.substringAfterLast("/")
67-
// Download the source code for the latest release
68-
val zipUrl = "https://github.com/open-telemetry/opamp-spec/zipball/$latestTag"
54+
val zipUrl = "https://github.com/open-telemetry/opamp-spec/zipball/v0.14.0"
6955

7056
download.run {
7157
src(zipUrl)

0 commit comments

Comments
 (0)