Skip to content

Commit a283e1f

Browse files
LauraXia123LauraXia123
authored
Merge branch 'main' into ci-issue
2 parents a622c36 + 2af41ca commit a283e1f

21 files changed

+129
-37
lines changed

‎.github/workflows/access-control-integration-test.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
changes:
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020
- uses: dorny/paths-filter@v3
2121
id: filter
2222
with:
@@ -61,7 +61,7 @@ jobs:
6161
env:
6262
PLATFORM: ${{ matrix.architecture }}
6363
steps:
64-
- uses: actions/checkout@v3
64+
- uses: actions/checkout@v4
6565

6666
- uses: actions/setup-java@v4
6767
with:
@@ -70,7 +70,7 @@ jobs:
7070
cache: 'gradle'
7171

7272
- name: Set up QEMU
73-
uses: docker/setup-qemu-action@v2
73+
uses: docker/setup-qemu-action@v3
7474

7575
- name: Check required command
7676
run: |

‎.github/workflows/auto-cherry-pick.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
if: ${{ contains(github.event.pull_request.labels.*.name, 'branch-0.7') && github.event.pull_request.merged == true }}
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v4
1717
with:
1818
fetch-depth: 0
1919
- name: Cherry pick into branch-0.7
@@ -31,7 +31,7 @@ jobs:
3131
if: ${{ contains(github.event.pull_request.labels.*.name, 'branch-0.8') && github.event.pull_request.merged == true }}
3232
steps:
3333
- name: Checkout
34-
uses: actions/checkout@v2
34+
uses: actions/checkout@v4
3535
with:
3636
fetch-depth: 0
3737
- name: Cherry pick into branch-0.8

‎.github/workflows/backend-integration-test-action.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
env:
3030
PLATFORM: ${{ inputs.architecture }}
3131
steps:
32-
- uses: actions/checkout@v3
32+
- uses: actions/checkout@v4
3333

3434
- uses: actions/setup-java@v4
3535
with:
@@ -38,7 +38,7 @@ jobs:
3838
cache: 'gradle'
3939

4040
- name: Set up QEMU
41-
uses: docker/setup-qemu-action@v2
41+
uses: docker/setup-qemu-action@v3
4242

4343
- name: Check required command
4444
run: |

‎.github/workflows/backend-integration-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
changes:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- uses: dorny/paths-filter@v3
2020
id: filter
2121
with:

‎.github/workflows/build.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
changes:
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121
- uses: dorny/paths-filter@v3
2222
id: filter
2323
with:
@@ -54,7 +54,7 @@ jobs:
5454
needs: changes
5555
if: needs.changes.outputs.source_changes != 'true'
5656
steps:
57-
- uses: actions/checkout@v3
57+
- uses: actions/checkout@v4
5858

5959
- uses: actions/setup-java@v4
6060
with:
@@ -72,7 +72,7 @@ jobs:
7272
needs: changes
7373
if: needs.changes.outputs.spark_connector_changes == 'true'
7474
steps:
75-
- uses: actions/checkout@v3
75+
- uses: actions/checkout@v4
7676

7777
- uses: actions/setup-java@v4
7878
with:
@@ -110,7 +110,7 @@ jobs:
110110
# Steps represent a sequence of tasks that will be executed as part of the job
111111
steps:
112112
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
113-
- uses: actions/checkout@v3
113+
- uses: actions/checkout@v4
114114

115115
- uses: actions/setup-java@v4
116116
with:

‎.github/workflows/cron-integration-test.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
if: github.repository == 'apache/gravitino'
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
- uses: dorny/paths-filter@v3
1919
id: filter
2020
with:
@@ -61,7 +61,7 @@ jobs:
6161
DOCKER_RUN_NAME: hive-amd64
6262
PLATFORM: ${{ matrix.architecture }}
6363
steps:
64-
- uses: actions/checkout@v3
64+
- uses: actions/checkout@v4
6565

6666
- uses: actions/setup-java@v4
6767
with:
@@ -71,7 +71,7 @@ jobs:
7171

7272

7373
- name: Set up QEMU
74-
uses: docker/setup-qemu-action@v2
74+
uses: docker/setup-qemu-action@v3
7575

7676
- name: Package Gravitino
7777
run: |

‎.github/workflows/docker-image.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
fi
104104
105105
- name: Set up QEMU
106-
uses: docker/setup-qemu-action@v2
106+
uses: docker/setup-qemu-action@v3
107107

108108
- name: Login to Docker Hub
109109
uses: docker/login-action@v2
@@ -114,7 +114,7 @@ jobs:
114114
- name: Set up Docker Buildx
115115
uses: docker/setup-buildx-action@v2
116116

117-
- uses: actions/checkout@v3
117+
- uses: actions/checkout@v4
118118

119119
- uses: actions/setup-java@v4
120120
with:

‎.github/workflows/flink-integration-test-action.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
env:
2222
PLATFORM: ${{ inputs.architecture }}
2323
steps:
24-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v4
2525

2626
- uses: actions/setup-java@v4
2727
with:
@@ -30,7 +30,7 @@ jobs:
3030
cache: 'gradle'
3131

3232
- name: Set up QEMU
33-
uses: docker/setup-qemu-action@v2
33+
uses: docker/setup-qemu-action@v3
3434

3535
- name: Check required command
3636
run: |

‎.github/workflows/flink-integration-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
changes:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- uses: dorny/paths-filter@v3
2020
id: filter
2121
with:

‎.github/workflows/frontend-integration-test.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
changes:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- uses: dorny/paths-filter@v3
2020
id: filter
2121
with:
@@ -58,7 +58,7 @@ jobs:
5858
env:
5959
PLATFORM: ${{ matrix.architecture }}
6060
steps:
61-
- uses: actions/checkout@v3
61+
- uses: actions/checkout@v4
6262

6363
- uses: actions/setup-java@v4
6464
with:
@@ -67,7 +67,7 @@ jobs:
6767
cache: 'gradle'
6868

6969
- name: Set up QEMU
70-
uses: docker/setup-qemu-action@v2
70+
uses: docker/setup-qemu-action@v3
7171

7272
- name: Check required command
7373
run: |

‎.github/workflows/gvfs-fuse-build-test.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
changes:
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020
- uses: dorny/paths-filter@v3
2121
id: filter
2222
with:
@@ -56,7 +56,7 @@ jobs:
5656
env:
5757
PLATFORM: ${{ matrix.architecture }}
5858
steps:
59-
- uses: actions/checkout@v3
59+
- uses: actions/checkout@v4
6060

6161
- uses: actions/setup-java@v4
6262
with:
@@ -65,7 +65,7 @@ jobs:
6565
cache: 'gradle'
6666

6767
- name: Set up QEMU
68-
uses: docker/setup-qemu-action@v2
68+
uses: docker/setup-qemu-action@v3
6969

7070
- name: Check required command
7171
run: |

‎.github/workflows/python-integration-test.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
changes:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- uses: dorny/paths-filter@v3
2020
id: filter
2121
with:
@@ -57,7 +57,7 @@ jobs:
5757
env:
5858
PLATFORM: ${{ matrix.architecture }}
5959
steps:
60-
- uses: actions/checkout@v3
60+
- uses: actions/checkout@v4
6161

6262
- uses: actions/setup-java@v4
6363
with:
@@ -66,7 +66,7 @@ jobs:
6666
cache: 'gradle'
6767

6868
- name: Set up QEMU
69-
uses: docker/setup-qemu-action@v2
69+
uses: docker/setup-qemu-action@v3
7070

7171
- name: Python Client Integration Test
7272
id: integrationTest

‎.github/workflows/spark-integration-test-action.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
env:
3030
PLATFORM: ${{ inputs.architecture }}
3131
steps:
32-
- uses: actions/checkout@v3
32+
- uses: actions/checkout@v4
3333

3434
- uses: actions/setup-java@v4
3535
with:
@@ -38,7 +38,7 @@ jobs:
3838
cache: 'gradle'
3939

4040
- name: Set up QEMU
41-
uses: docker/setup-qemu-action@v2
41+
uses: docker/setup-qemu-action@v3
4242

4343
- name: Check required command
4444
run: |

‎.github/workflows/spark-integration-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
changes:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- uses: dorny/paths-filter@v3
2020
id: filter
2121
with:

‎.github/workflows/trino-integration-test.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
changes:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- uses: dorny/paths-filter@v3
2020
id: filter
2121
with:
@@ -59,7 +59,7 @@ jobs:
5959
env:
6060
PLATFORM: ${{ matrix.architecture }}
6161
steps:
62-
- uses: actions/checkout@v3
62+
- uses: actions/checkout@v4
6363

6464
- uses: actions/setup-java@v4
6565
with:
@@ -68,7 +68,7 @@ jobs:
6868
cache: 'gradle'
6969

7070
- name: Set up QEMU
71-
uses: docker/setup-qemu-action@v2
71+
uses: docker/setup-qemu-action@v3
7272

7373
- name: Check required command
7474
run: |

‎MAINTAINERS.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ All contributions from the people listed are licensed under the Apache License v
115115
|----------------|---------------------|------------------|
116116
| Kuan-Po Tseng | brandboat | SUSE |
117117
| Nicholas Jiang | SteNicholas | Bilibili |
118-
| Eric Chang | unknowntpo | Lawsnote |
118+
| Eric Chang | unknowntpo | opensource4you |
119119
| Sophie Sun | SophieTech88 | ExtraHop Network |
120120
| Xing Yong | YxAc | Xiaomi |
121121
| Liwei Yang | lw-yang | Xiaomi |

‎core/src/main/java/org/apache/gravitino/metrics/MetricNames.java

+6
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@
2222
public class MetricNames {
2323
public static final String HTTP_PROCESS_DURATION = "http-request-duration-seconds";
2424
public static final String SERVER_IDLE_THREAD_NUM = "http-server.idle-thread.num";
25+
public static final String ENTITY_STORE_RELATION_DATASOURCE_ACTIVE_CONNECTIONS =
26+
"entity-store.relation-datasource.active-connections";
27+
public static final String ENTITY_STORE_RELATION_DATASOURCE_IDLE_CONNECTIONS =
28+
"entity-store.relation-datasource.idle-connections";
29+
public static final String ENTITY_STORE_RELATION_DATASOURCE_MAX_CONNECTIONS =
30+
"entity-store.relation-datasource.max-connections";
2531

2632
private MetricNames() {}
2733
}

‎core/src/main/java/org/apache/gravitino/metrics/source/RelationDatasourceMetricsSource.java

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
package org.apache.gravitino.metrics.source;
21+
22+
import com.codahale.metrics.Gauge;
23+
import org.apache.commons.dbcp2.BasicDataSource;
24+
import org.apache.gravitino.metrics.MetricNames;
25+
26+
public class RelationDatasourceMetricsSource extends MetricsSource {
27+
28+
public RelationDatasourceMetricsSource(BasicDataSource dataSource) {
29+
super(MetricsSource.GRAVITINO_SERVER_METRIC_NAME);
30+
registerGauge(
31+
MetricNames.ENTITY_STORE_RELATION_DATASOURCE_ACTIVE_CONNECTIONS,
32+
(Gauge<Integer>) dataSource::getNumActive);
33+
registerGauge(
34+
MetricNames.ENTITY_STORE_RELATION_DATASOURCE_IDLE_CONNECTIONS,
35+
(Gauge<Integer>) dataSource::getNumIdle);
36+
registerGauge(
37+
MetricNames.ENTITY_STORE_RELATION_DATASOURCE_MAX_CONNECTIONS,
38+
(Gauge<Integer>) dataSource::getMaxTotal);
39+
}
40+
}

0 commit comments

Comments
 (0)