Skip to content

Commit 8453853

Browse files
author
Jeel Mehta
committed
Adding separate settings.gradle.kts file for the sample app and removing integ-test-app from settings file of the root and making changes to the workflow
1 parent 15e8fb8 commit 8453853

File tree

4 files changed

+35
-9
lines changed

4 files changed

+35
-9
lines changed

.github/workflows/release-udp-exporter.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ jobs:
3838
run: chmod +x gradlew
3939

4040
- name: Build UDP exporter
41+
working-directory: ./exporters/aws-otel-otlp-udp-exporter
4142
run: |
42-
./gradlew -p ./exporters/aws-otel-otlp-udp-exporter clean build --refresh-dependencies -x test
43+
../../gradlew clean build -x test
4344
4445
- name: Download and run X-Ray Daemon
4546
run: |
@@ -50,8 +51,9 @@ jobs:
5051
./xray -o -n us-west-2 -f ./daemon-logs.log --log-level debug &
5152
5253
- name: Install UDP Exporter
54+
working-directory: ./exporters/aws-otel-otlp-udp-exporter
5355
run: |
54-
./gradlew -p ./exporters/aws-otel-otlp-udp-exporter publishMavenJavaPublicationToMavenLocal -Psigning.skip=true -x sign --refresh-dependencies
56+
./gradlew -p ./exporters/aws-otel-otlp-udp-exporter publishMavenJavaPublicationToMavenLocal -Psigning.skip=true -x sign
5557
5658
- name: Ensure Unit Tests are passing
5759
working-directory: exporters/aws-otel-otlp-udp-exporter
@@ -61,7 +63,7 @@ jobs:
6163
- name: Run Sample App in Background
6264
working-directory: sample-apps/integ-test-app
6365
run: |
64-
../../gradlew :sample-apps:integ-test-app:build --refresh-dependencies
66+
../../gradlew build
6567
java -jar build/libs/integ-test-app.jar &
6668
sleep 5
6769

sample-apps/integ-test-app/build.gradle.kts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@ plugins {
55
id("org.springframework.boot") version "2.7.17"
66
}
77

8-
repositories {
9-
mavenLocal()
10-
mavenCentral()
11-
}
12-
138
dependencies {
149
implementation("org.springframework.boot:spring-boot-starter-web")
1510
implementation("software.amazon.opentelemetry.exporters.otlp.udp.trace:aws-otel-otlp-udp-exporter:0.0.1")
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
*
2+
* Copyright Amazon.com, Inc. or its affiliates.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* A copy of the License is located at
7+
*
8+
* http://aws.amazon.com/apache2.0
9+
*
10+
* or in the "license" file accompanying this file. This file is distributed
11+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12+
* express or implied. See the License for the specific language governing
13+
* permissions and limitations under the License.
14+
*/
15+
16+
rootProject.name = "integ-test-app"
17+
18+
pluginManagement {
19+
repositories {
20+
mavenCentral()
21+
}
22+
}
23+
24+
dependencyResolutionManagement {
25+
repositories {
26+
mavenLocal() // For your UDP exporter
27+
mavenCentral()
28+
}
29+
}

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ include(":smoke-tests:spring-boot")
5151
include(":sample-apps:springboot")
5252
include(":sample-apps:spark")
5353
include(":sample-apps:spark-awssdkv1")
54-
include(":sample-apps:integ-test-app")
54+
5555

5656
// Used for contract tests
5757
include("appsignals-tests:images:mock-collector")

0 commit comments

Comments
 (0)