Skip to content

Commit

Permalink
easier import+reformatting (#20)
Browse files Browse the repository at this point in the history
* add .editorconfig for code formatting

* add idea plugin for easy project open

* try some new formatting

* reformat

* add checkstyle config from upstream

* remove useless test

* enable tests in CI

* reformat code

* keep long lines as we are used to

* reformat + same defaults as otel

* now check with verify

* s/verify/check/
  • Loading branch information
SylvainJuge authored Oct 16, 2023
1 parent 05a76d8 commit fa913fc
Show file tree
Hide file tree
Showing 10 changed files with 1,405 additions and 200 deletions.
763 changes: 763 additions & 0 deletions .editorconfig

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v4
- uses: gradle/[email protected]

assemble:
gradle:
runs-on: ubuntu-latest
steps:

Expand All @@ -29,14 +29,14 @@ jobs:
distribution: temurin
java-version: 17

- name: Gradle assemble
- name: Gradle build, test and check
uses: gradle/gradle-build-action@v2
with:
arguments: assemble
arguments: check

- name: Agent artifact
uses: actions/upload-artifact@v3
with:
name: elastic-otel-javaagent
path: |
./agent/build/libs/elastic-otel-javaagent-*.jar
./agent/build/libs/elastic-otel-javaagent-*.jar
19 changes: 11 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
plugins {
id "idea"
}

group 'co.elastic.apm'
version '0.0.1-SNAPSHOT'
Expand All @@ -12,10 +15,10 @@ subprojects {

ext {
deps = [
autoservice: [
"com.google.auto.service:auto-service:"+libraries.versions.autoservice.get(),
"com.google.auto.service:auto-service-annotations:"+libraries.versions.autoservice.get(),
]
autoservice: [
"com.google.auto.service:auto-service:" + libraries.versions.autoservice.get(),
"com.google.auto.service:auto-service-annotations:" + libraries.versions.autoservice.get(),
]
]
}

Expand All @@ -37,15 +40,15 @@ subprojects {

dependencies {

implementation(platform("io.opentelemetry:opentelemetry-bom:"+libraries.versions.opentelemetrySdk.get().toString()))
implementation(platform("io.opentelemetry:opentelemetry-bom:" + libraries.versions.opentelemetrySdk.get().toString()))

// these serve as a test of the instrumentation boms
implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:"+libraries.versions.opentelemetryJavaagent.get().toString()))
implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:"+libraries.versions.opentelemetryJavaagentAlpha.get().toString()))
implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:" + libraries.versions.opentelemetryJavaagent.get().toString()))
implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:" + libraries.versions.opentelemetryJavaagentAlpha.get().toString()))

testImplementation("org.mockito:mockito-core:5.5.0")

testImplementation(enforcedPlatform("org.junit:junit-bom:"+libraries.versions.junit.get().toString()))
testImplementation(enforcedPlatform("org.junit:junit-bom:" + libraries.versions.junit.get().toString()))
testImplementation("org.junit.jupiter:junit-jupiter")
}

Expand Down
Loading

0 comments on commit fa913fc

Please sign in to comment.