Skip to content

Commit

Permalink
fix test
Browse files Browse the repository at this point in the history
  • Loading branch information
zeitlinger committed Dec 3, 2024
1 parent e95e607 commit 2374d07
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 54 deletions.
5 changes: 3 additions & 2 deletions HACKATHON.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
## Building

1. Check out https://github.com/zeitlinger/opentelemetry-java-instrumentation/tree/http-client-response-consumer
2. Run `./gradlew publishToMavenLocal` in the root directory of the project
2. Run `./gradlew publishToMavenLocal` in the root directory of the project (doesn't work yet)
3. Go to the root directory of this project
4. Apply the patch `git apply opentelemetry-java-instrumentation.patch`
4. Use the snapshot version in https://github.com/grafana/grafana-opentelemetry-java/blob/et-phone-home/build.gradle
(doesn't work yet)
5. Run `./gradlew clean assemble`
6. Copy `agent/build/libs/grafana-opentelemetry-java.jar` to wherever you want to use the agent jar,
e.g. `cp agent/build/libs/grafana-opentelemetry-java.jar ~/source/docker-otel-lgtm/examples/java`
Expand Down
50 changes: 0 additions & 50 deletions build-local.patch

This file was deleted.

10 changes: 8 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
import java.util.regex.Pattern

group 'com.grafana'
version '10.0.0-SNAPSHOT' // the version of the actual release is set during the release process in build-release.sh

buildscript {
ext {
// otelInstrumentationVersion = "2.11.0-SNAPSHOT"
otelInstrumentationVersion = "2.10.0"
otelInstrumentationVersionAlpha = otelInstrumentationVersion.replaceFirst(Pattern.compile("(-SNAPSHOT)?\$"), "-alpha\$1")
}
repositories {
mavenLocal()
maven {
url "https://plugins.gradle.org/m2/"
}
}
dependencies {
classpath "com.diffplug.spotless:spotless-plugin-gradle:6.25.0"
classpath "com.gradleup.shadow:shadow-gradle-plugin:8.3.5"
classpath "io.opentelemetry.instrumentation:gradle-plugins:${otelInstrumentationVersion}-alpha"
classpath "io.opentelemetry.instrumentation:gradle-plugins:${otelInstrumentationVersionAlpha}"
}
}

Expand All @@ -26,7 +31,7 @@ subprojects {
ext {
versions = [
opentelemetryJavaagent : otelInstrumentationVersion,
opentelemetryJavaagentAlpha: "${otelInstrumentationVersion}-alpha",
opentelemetryJavaagentAlpha: otelInstrumentationVersionAlpha,

bytebuddy : "1.15.10",
autoservice : "1.1.1",
Expand All @@ -45,6 +50,7 @@ subprojects {
}

repositories {
mavenLocal()
mavenCentral()
}

Expand Down

0 comments on commit 2374d07

Please sign in to comment.