Skip to content

Commit 78f8762

Browse files
zeitlingerzeitlinger
authored
add label to renovate prs (#1446)
Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
1 parent 62bf33c commit 78f8762

File tree

6 files changed

+167
-116
lines changed

6 files changed

+167
-116
lines changed

‎.github/renovate.json5

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
{
22
$schema: "https://docs.renovatebot.com/renovate-schema.json",
3-
extends: ["config:recommended"],
3+
extends: ["config:best-practices", "config:recommended"],
44
platformCommit: "enabled",
55
automerge: true,
66
ignorePaths: [
77
"**/simpleclient-archive/**", // old projects
88
// agent resources packages an OTel API that is the minimum required API version
99
"**/prometheus-metrics-exporter-opentelemetry-otel-agent-resources/pom.xml",
1010
],
11+
labels: ["dependencies"],
1112
}

‎.github/workflows/test-release-build.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,7 @@ jobs:
2525
restore-keys: |
2626
${{ runner.os }}-maven-
2727
- name: Run the Maven verify phase
28-
run: mise run build-release
28+
run: ./scripts/build-release.sh
29+
env:
30+
# don't ues the current snapshot version, to test a more realistic release
31+
TAG: ${{ github.run_number }}

‎pom.xml

Lines changed: 76 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -69,50 +69,6 @@
6969
<version>3.0.2</version>
7070
<scope>provided</scope>
7171
</dependency>
72-
73-
<!-- test dependencies -->
74-
<dependency>
75-
<groupId>org.junit.jupiter</groupId>
76-
<artifactId>junit-jupiter</artifactId>
77-
<version>${junit-jupiter.version}</version>
78-
<scope>test</scope>
79-
</dependency>
80-
<dependency>
81-
<groupId>org.junit.jupiter</groupId>
82-
<artifactId>junit-jupiter-params</artifactId>
83-
<version>${junit-jupiter.version}</version>
84-
<scope>test</scope>
85-
</dependency>
86-
<dependency>
87-
<groupId>org.mockito</groupId>
88-
<artifactId>mockito-core</artifactId>
89-
<version>5.18.0</version>
90-
<scope>test</scope>
91-
</dependency>
92-
<dependency>
93-
<groupId>org.assertj</groupId>
94-
<artifactId>assertj-core</artifactId>
95-
<version>3.27.3</version>
96-
<scope>test</scope>
97-
</dependency>
98-
<dependency>
99-
<groupId>com.google.guava</groupId>
100-
<artifactId>guava</artifactId>
101-
<version>${guava.version}</version>
102-
<scope>test</scope>
103-
</dependency>
104-
<dependency>
105-
<groupId>org.slf4j</groupId>
106-
<artifactId>slf4j-simple</artifactId>
107-
<version>2.0.17</version>
108-
<scope>test</scope>
109-
</dependency>
110-
<dependency>
111-
<groupId>org.junit-pioneer</groupId>
112-
<artifactId>junit-pioneer</artifactId>
113-
<version>2.3.0</version>
114-
<scope>test</scope>
115-
</dependency>
11672
</dependencies>
11773

11874
<build>
@@ -387,8 +343,84 @@
387343
<type>pom</type>
388344
<scope>import</scope>
389345
</dependency>
346+
<dependency>
347+
<groupId>io.opentelemetry.instrumentation</groupId>
348+
<artifactId>opentelemetry-instrumentation-bom-alpha</artifactId>
349+
<version>${otel.instrumentation.version}</version>
350+
<type>pom</type>
351+
<scope>import</scope>
352+
</dependency>
353+
<dependency>
354+
<groupId>io.opentelemetry</groupId>
355+
<artifactId>opentelemetry-proto</artifactId>
356+
<version>1.7.1-alpha</version>
357+
<scope>test</scope>
358+
</dependency>
390359
</dependencies>
391360
</dependencyManagement>
361+
<dependencies>
362+
<!-- test dependencies -->
363+
<dependency>
364+
<groupId>org.junit.jupiter</groupId>
365+
<artifactId>junit-jupiter</artifactId>
366+
<version>${junit-jupiter.version}</version>
367+
<scope>test</scope>
368+
</dependency>
369+
<dependency>
370+
<groupId>org.junit.jupiter</groupId>
371+
<artifactId>junit-jupiter-params</artifactId>
372+
<version>${junit-jupiter.version}</version>
373+
<scope>test</scope>
374+
</dependency>
375+
<dependency>
376+
<groupId>org.mockito</groupId>
377+
<artifactId>mockito-core</artifactId>
378+
<version>5.18.0</version>
379+
<scope>test</scope>
380+
</dependency>
381+
<dependency>
382+
<groupId>org.assertj</groupId>
383+
<artifactId>assertj-core</artifactId>
384+
<version>3.27.3</version>
385+
<scope>test</scope>
386+
</dependency>
387+
<dependency>
388+
<groupId>com.google.guava</groupId>
389+
<artifactId>guava</artifactId>
390+
<version>${guava.version}</version>
391+
<scope>test</scope>
392+
</dependency>
393+
<dependency>
394+
<groupId>org.slf4j</groupId>
395+
<artifactId>slf4j-simple</artifactId>
396+
<version>2.0.17</version>
397+
<scope>test</scope>
398+
</dependency>
399+
<dependency>
400+
<groupId>org.junit-pioneer</groupId>
401+
<artifactId>junit-pioneer</artifactId>
402+
<version>2.3.0</version>
403+
<scope>test</scope>
404+
</dependency>
405+
<dependency>
406+
<groupId>org.awaitility</groupId>
407+
<artifactId>awaitility</artifactId>
408+
<version>4.3.0</version>
409+
<scope>test</scope>
410+
</dependency>
411+
<dependency>
412+
<groupId>org.wiremock</groupId>
413+
<artifactId>wiremock</artifactId>
414+
<version>3.13.1</version>
415+
<scope>test</scope>
416+
<exclusions>
417+
<exclusion>
418+
<groupId>org.hamcrest</groupId>
419+
<artifactId>hamcrest-core</artifactId>
420+
</exclusion>
421+
</exclusions>
422+
</dependency>
423+
</dependencies>
392424
</profile>
393425
<profile>
394426
<id>javadoc</id>

‎prometheus-metrics-exporter-opentelemetry-shaded/pom.xml

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -68,39 +68,37 @@
6868
<groupId>io.opentelemetry.instrumentation</groupId>
6969
<artifactId>opentelemetry-resources</artifactId>
7070
</dependency>
71-
72-
<!-- test dependencies -->
73-
<dependency>
74-
<groupId>org.wiremock</groupId>
75-
<artifactId>wiremock</artifactId>
76-
<version>3.13.1</version>
77-
<scope>test</scope>
78-
<exclusions>
79-
<exclusion>
80-
<groupId>org.hamcrest</groupId>
81-
<artifactId>hamcrest-core</artifactId>
82-
</exclusion>
83-
</exclusions>
84-
</dependency>
85-
<dependency>
86-
<groupId>org.awaitility</groupId>
87-
<artifactId>awaitility</artifactId>
88-
<version>4.3.0</version>
89-
<scope>test</scope>
90-
</dependency>
91-
<dependency>
92-
<groupId>io.opentelemetry</groupId>
93-
<artifactId>opentelemetry-proto</artifactId>
94-
<version>1.7.1-alpha</version>
95-
<scope>test</scope>
96-
</dependency>
97-
<dependency>
98-
<groupId>io.opentelemetry</groupId>
99-
<artifactId>opentelemetry-sdk-testing</artifactId>
100-
<scope>test</scope>
101-
</dependency>
10271
</dependencies>
10372

73+
<profiles>
74+
<!-- just to make sure that default profile is only activated if no profiles are specified -->
75+
<profile>
76+
<id>javadoc</id>
77+
</profile>
78+
<profile>
79+
<id>release</id>
80+
</profile>
81+
<profile>
82+
<id>default</id>
83+
<activation>
84+
<activeByDefault>true</activeByDefault>
85+
</activation>
86+
<dependencies>
87+
<!-- GH pages and release task try to resolve this and fail -->
88+
<dependency>
89+
<groupId>io.opentelemetry</groupId>
90+
<artifactId>opentelemetry-proto</artifactId>
91+
<scope>test</scope>
92+
</dependency>
93+
<dependency>
94+
<groupId>io.opentelemetry</groupId>
95+
<artifactId>opentelemetry-sdk-testing</artifactId>
96+
<scope>test</scope>
97+
</dependency>
98+
</dependencies>
99+
</profile>
100+
</profiles>
101+
104102
<build>
105103
<resources>
106104
<resource>
@@ -127,7 +125,7 @@
127125
<directory>../prometheus-metrics-exporter-opentelemetry/src/main</directory>
128126
</resource>
129127
<resources>
130-
</resources>
128+
</resources>
131129
</resources>
132130
</configuration>
133131
</execution>

‎prometheus-metrics-exporter-opentelemetry/pom.xml

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -69,39 +69,37 @@
6969
<groupId>io.opentelemetry.instrumentation</groupId>
7070
<artifactId>opentelemetry-resources</artifactId>
7171
</dependency>
72-
73-
<!-- test dependencies -->
74-
<dependency>
75-
<groupId>org.wiremock</groupId>
76-
<artifactId>wiremock</artifactId>
77-
<version>3.13.1</version>
78-
<scope>test</scope>
79-
<exclusions>
80-
<exclusion>
81-
<groupId>org.hamcrest</groupId>
82-
<artifactId>hamcrest-core</artifactId>
83-
</exclusion>
84-
</exclusions>
85-
</dependency>
86-
<dependency>
87-
<groupId>org.awaitility</groupId>
88-
<artifactId>awaitility</artifactId>
89-
<version>4.3.0</version>
90-
<scope>test</scope>
91-
</dependency>
92-
<dependency>
93-
<groupId>io.opentelemetry</groupId>
94-
<artifactId>opentelemetry-proto</artifactId>
95-
<version>1.7.1-alpha</version>
96-
<scope>test</scope>
97-
</dependency>
98-
<dependency>
99-
<groupId>io.opentelemetry</groupId>
100-
<artifactId>opentelemetry-sdk-testing</artifactId>
101-
<scope>test</scope>
102-
</dependency>
10372
</dependencies>
10473

74+
<profiles>
75+
<!-- just to make sure that default profile is only activated if no profiles are specified -->
76+
<profile>
77+
<id>javadoc</id>
78+
</profile>
79+
<profile>
80+
<id>release</id>
81+
</profile>
82+
<profile>
83+
<id>default</id>
84+
<activation>
85+
<activeByDefault>true</activeByDefault>
86+
</activation>
87+
<dependencies>
88+
<!-- GH pages and release task try to resolve this and fail -->
89+
<dependency>
90+
<groupId>io.opentelemetry</groupId>
91+
<artifactId>opentelemetry-proto</artifactId>
92+
<scope>test</scope>
93+
</dependency>
94+
<dependency>
95+
<groupId>io.opentelemetry</groupId>
96+
<artifactId>opentelemetry-sdk-testing</artifactId>
97+
<scope>test</scope>
98+
</dependency>
99+
</dependencies>
100+
</profile>
101+
</profiles>
102+
105103
<build>
106104
<resources>
107105
<resource>

‎prometheus-metrics-exposition-formats-shaded/pom.xml

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,34 @@
3333
<artifactId>protobuf-java</artifactId>
3434
<version>${protobuf-java.version}</version>
3535
</dependency>
36-
<dependency>
37-
<groupId>io.prometheus</groupId>
38-
<artifactId>prometheus-metrics-exposition-textformats</artifactId>
39-
<version>${project.version}</version>
40-
<scope>test</scope>
41-
<type>test-jar</type>
42-
</dependency>
4336
</dependencies>
4437

38+
<profiles>
39+
<!-- just to make sure that default profile is only activated if no profiles are specified -->
40+
<profile>
41+
<id>javadoc</id>
42+
</profile>
43+
<profile>
44+
<id>release</id>
45+
</profile>
46+
<profile>
47+
<id>default</id>
48+
<activation>
49+
<activeByDefault>true</activeByDefault>
50+
</activation>
51+
<dependencies>
52+
<!-- GH pages and release task try to resolve this and fail -->
53+
<dependency>
54+
<groupId>io.prometheus</groupId>
55+
<artifactId>prometheus-metrics-exposition-textformats</artifactId>
56+
<version>${project.version}</version>
57+
<scope>test</scope>
58+
<type>test-jar</type>
59+
</dependency>
60+
</dependencies>
61+
</profile>
62+
</profiles>
63+
4564
<build>
4665
<plugins>
4766
<plugin>

0 commit comments

Comments
 (0)