Skip to content

Commit

Permalink
Merge branch 'open-telemetry:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Victorsesan authored Oct 27, 2024
2 parents d6b4d5c + e785fc6 commit 42a434a
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/remove-needs-author-feedback.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
github.event.comment.user.login == github.event.issue.user.login
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Remove labels
env:
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unreleased

## Version 0.8.0 (2024-10-18)

### 📈 Enhancements

- HttpURLConnection instrumentation migration to AutoService API
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ in your gradle build script:
```kotlin
dependencies {
//...
implementation("io.opentelemetry.android:android-agent:0.7.0-alpha")
implementation("io.opentelemetry.android:android-agent:0.8.0-alpha")
//...
}
```
Expand Down
2 changes: 1 addition & 1 deletion demo-app/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
opentelemetry = "1.43.0"
opentelemetry-alpha = "1.43.0-alpha"
junit = "5.11.2"
junit = "5.11.3"
spotless = "6.25.0"
kotlin = "2.0.21"
navigation-compose = "2.7.7"
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ android.useAndroidX=true

android.minSdk=21
android.compileSdk=34
version=0.8.0
version=0.9.0
group=io.opentelemetry.android
12 changes: 6 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ opentelemetry-instrumentation-alpha = "2.9.0-alpha"
opentelemetry-semconv = "1.25.0-alpha"
opentelemetry-contrib = "1.40.0-alpha"
mockito = "5.14.2"
junit = "5.11.2"
byteBuddy = "1.15.5"
junit = "5.11.3"
byteBuddy = "1.15.7"
okhttp = "4.12.0"
spotless = "6.25.0"
kotlin = "2.0.21"
Expand Down Expand Up @@ -52,7 +52,7 @@ mockk = "io.mockk:mockk:1.13.13"
junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
junit-vintage-engine = { module = "org.junit.vintage:junit-vintage-engine", version.ref = "junit" }
junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version = "1.11.2" }
junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version = "1.11.3" }
robolectric = "org.robolectric:robolectric:4.13"
assertj-core = "org.assertj:assertj-core:3.26.3"
awaitility = "org.awaitility:awaitility:4.2.2"
Expand All @@ -62,11 +62,11 @@ okhttp-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.
#Compilation tools
desugarJdkLibs = "com.android.tools:desugar_jdk_libs:2.1.2"
nullaway = "com.uber.nullaway:nullaway:0.12.0"
errorprone-core = "com.google.errorprone:error_prone_core:2.33.0"
errorprone-core = "com.google.errorprone:error_prone_core:2.35.1"
errorprone-javac = "com.google.errorprone:javac:9+181-r4173-1"
spotless-plugin = { module = "com.diffplug.spotless:spotless-plugin-gradle", version.ref = "spotless" }
errorprone-plugin = "net.ltgt.gradle:gradle-errorprone-plugin:4.0.1"
nullaway-plugin = "net.ltgt.gradle:gradle-nullaway-plugin:2.0.0"
errorprone-plugin = "net.ltgt.gradle:gradle-errorprone-plugin:4.1.0"
nullaway-plugin = "net.ltgt.gradle:gradle-nullaway-plugin:2.1.0"
animalsniffer-plugin = "ru.vyarus:gradle-animalsniffer-plugin:1.7.1"
android-plugin = { module = "com.android.tools.build:gradle", version.ref = "androidPlugin" }
byteBuddy-plugin = { module = "net.bytebuddy:byte-buddy-gradle-plugin", version.ref = "byteBuddy" }
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/okhttp/okhttp-3.0/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ release](https://search.maven.org/search?q=g:net.bytebuddy%20AND%20a:byte-buddy)
This plugin leverages
Android's [Transform API](https://developer.android.com/reference/tools/gradle-api/current/com/android/build/api/variant/ScopedArtifactsOperation#toTransform(com.android.build.api.artifact.ScopedArtifact,kotlin.Function1,kotlin.Function1,kotlin.Function1))
to instrument bytecode at compile time. You can find more info on
its [repo page](https://github.com/raphw/byte-buddy/tree/master/byte-buddy-gradle-plugin/android-plugin.
its [repo page](https://github.com/raphw/byte-buddy/tree/master/byte-buddy-gradle-plugin/android-plugin).

```groovy
plugins {
Expand All @@ -41,7 +41,7 @@ automatically.

You can configure the automatic instrumentation by using the setters
from
the [OkHttpInstrumentation](library/src/main/java/io/opentelemetry/instrumentation/library/okhttp/v3_0/OkHttpInstrumentation.java))
the [OkHttpInstrumentation](library/src/main/java/io/opentelemetry/instrumentation/library/okhttp/v3_0/OkHttpInstrumentation.java)
instance provided via the AndroidInstrumentationLoader as shown below:

```java
Expand Down

0 comments on commit 42a434a

Please sign in to comment.