Skip to content

Upgrades parquet-avro dep #1403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pipelines/batch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
<nemo.version>0.1</nemo.version>
<flink.artifact.name>beam-runners-flink-1.14</flink.artifact.name>
<mysql.driver.version>8.0.30</mysql.driver.version>
<mysql.driver.version>9.3.0</mysql.driver.version>
<postgresql.version>42.7.7</postgresql.version>

</properties>
Expand Down Expand Up @@ -73,8 +73,8 @@
<!--JDBC specific dependencies-->

<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>${mysql.driver.version}</version>
<!-- We need to exclude this to avoid the clash with the same dependency under the artifact
org.apache.beam:beam-sdks-java-io-google-cloud-platform so that it does not end up in
Expand Down
2 changes: 1 addition & 1 deletion pipelines/common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-avro</artifactId>
<version>1.13.1</version>
<version>1.15.2</version>
</dependency>

<!-- TODO: This is in the dependencies of the above with "provided" scope.
Expand Down
9 changes: 7 additions & 2 deletions pipelines/controller/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2020-2024 Google LLC
Copyright 2020-2025 Google LLC

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -30,7 +30,7 @@

<properties>
<java.version>17</java.version>
<spring-boot.version>3.2.2</spring-boot.version>
<spring-boot.version>3.5.3</spring-boot.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -85,6 +85,11 @@
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
</dependency>
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient</artifactId>
<version>0.16.0</version>
</dependency>

<!-- This is to make it easier to hot-swap static content, i.e., to make
testing static content changes in a running server easier. -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2020-2023 Google LLC
* Copyright 2020-2025 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -26,21 +26,21 @@
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
import org.springframework.boot.actuate.endpoint.web.WebEndpointResponse;
import org.springframework.boot.actuate.endpoint.web.annotation.WebEndpoint;
import org.springframework.stereotype.Component;
import org.springframework.util.MimeType;
import org.springframework.util.MimeTypeUtils;

/**
* This is a custom implementation of the spring actuator {@link Endpoint @Endpoint} which exports
* only the pipeline metrics in a format that can be scraped by the Prometheus server.
*/
@WebEndpoint(id = "pipeline-metrics")
@Component
// @WebEndpoint(id = "pipeline-metrics")
// @Component
public class PipelineMetricsEndpoint {

private static final int METRICS_SCRAPE_CHARS_EXTRA = 1024;

// The CollectorRegistry @Bean is removed after Spring 3.2.2 so this component needs to be fixed
// (see PrometheusMetricsExportAutoConfiguration).
private final CollectorRegistry collectorRegistry;

private volatile int nextMetricsScrapeSize = 16;
Expand Down
Loading