Skip to content

Commit 7f54e8c

Browse files
SylvainJugeSylvainJuge
committed
Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into state-metrics-semconv
2 parents 31a890d + dbd47db commit 7f54e8c

File tree

47 files changed

+741
-302
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+741
-302
lines changed

‎.fossa.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,9 @@ targets:
427427
- type: gradle
428428
path: ./
429429
target: ':instrumentation:couchbase:couchbase-3.2:javaagent'
430+
- type: gradle
431+
path: ./
432+
target: ':instrumentation:couchbase:couchbase-3.4:javaagent'
430433
- type: gradle
431434
path: ./
432435
target: ':instrumentation:dropwizard:dropwizard-metrics-4.0:javaagent'

‎.github/renovate.json5‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -46,56 +46,58 @@
4646
{
4747
groupName: 'quarkus packages',
4848
matchPackageNames: [
49-
'io.quarkus{/,}**',
49+
'io.quarkus:**',
5050
],
5151
},
5252
{
5353
groupName: 'gradle develocity packages',
5454
matchPackageNames: [
55-
'com.gradle.develocity{/,}**',
55+
'com.gradle.develocity:**',
5656
],
5757
},
5858
{
5959
groupName: 'armeria packages',
6060
matchPackageNames: [
61-
'com.linecorp.armeria:{/,}**',
61+
'com.linecorp.armeria:**',
6262
],
6363
},
6464
{
6565
groupName: 'spotless packages',
6666
matchPackageNames: [
67-
'com.diffplug.spotless{/,}**',
67+
'com.diffplug.spotless',
68+
'com.diffplug.spotless:**',
6869
],
6970
},
7071
{
7172
groupName: 'byte buddy packages',
7273
matchPackageNames: [
73-
'net.bytebuddy:{/,}**',
74+
'net.bytebuddy:**',
7475
],
7576
},
7677
{
7778
groupName: 'gradle shadow packages',
7879
matchPackageNames: [
79-
'com.gradleup.shadow{/,}**',
80+
'com.gradleup.shadow:**',
8081
],
8182
},
8283
{
8384
groupName: 'guava packages',
8485
matchPackageNames: [
85-
'com.google.guava{/,}**',
86+
'com.google.guava:**',
8687
],
8788
},
8889
{
8990
groupName: 'jackson packages',
9091
matchPackageNames: [
91-
'com.fasterxml.jackson{/,}**',
92+
'com.fasterxml.jackson:**',
93+
'com.fasterxml.jackson.core:**',
9294
],
9395
},
9496
{
9597
// prevent update to 2.4-groovy-4.0-SNAPSHOT
9698
allowedVersions: '!/\\-SNAPSHOT$/',
9799
matchPackageNames: [
98-
'org.spockframework:{/,}**',
100+
'org.spockframework:**',
99101
],
100102
},
101103
{
@@ -109,7 +111,7 @@
109111
// OpenTelemetry SDK updates are handled by auto-update-otel-sdk.yml
110112
enabled: false,
111113
matchPackageNames: [
112-
'io.opentelemetry:{/,}**',
114+
'io.opentelemetry:**',
113115
],
114116
},
115117
{
@@ -140,7 +142,7 @@
140142
],
141143
enabled: false,
142144
matchPackageNames: [
143-
'org.mockito:{/,}**',
145+
'org.mockito:**',
144146
],
145147
},
146148
{
@@ -212,7 +214,7 @@
212214
],
213215
enabled: false,
214216
matchPackageNames: [
215-
'ch.qos.logback:{/,}**',
217+
'ch.qos.logback:**',
216218
],
217219
},
218220
{
@@ -225,7 +227,7 @@
225227
],
226228
enabled: false,
227229
matchPackageNames: [
228-
'org.slf4j:{/,}**',
230+
'org.slf4j:**',
229231
],
230232
},
231233
{
@@ -239,8 +241,8 @@
239241
],
240242
enabled: false,
241243
matchPackageNames: [
242-
'com.google.inject:{/,}**',
243-
'com.google.inject.extensions:{/,}**',
244+
'com.google.inject:**',
245+
'com.google.inject.extensions:**',
244246
],
245247
},
246248
{
@@ -316,7 +318,7 @@
316318
],
317319
enabled: false,
318320
matchPackageNames: [
319-
'ch.qos.logback:{/,}**',
321+
'ch.qos.logback:**',
320322
],
321323
},
322324
{
@@ -329,7 +331,7 @@
329331
],
330332
enabled: false,
331333
matchPackageNames: [
332-
'org.springframework.boot:spring-boot-dependencies{/,}**',
334+
'org.springframework.boot:spring-boot-dependencies:**',
333335
],
334336
},
335337
{
@@ -342,7 +344,7 @@
342344
],
343345
enabled: false,
344346
matchPackageNames: [
345-
'org.eclipse.jetty:{/,}**',
347+
'org.eclipse.jetty:**',
346348
],
347349
},
348350
],

‎.github/repository-settings.md‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ private admin repo.
1010

1111
- `GPG_PASSWORD` - stored in OpenTelemetry-Java 1Password
1212
- `GPG_PRIVATE_KEY` - stored in OpenTelemetry-Java 1Password
13-
- `DEVELOCITY_ACCESS_KEY` - owned by [@trask](https://github.com/trask)
14-
- Generated at https://develocity.opentelemetry.io > My settings > Access keys
15-
- Format of env var is `develocity.opentelemetry.io=<access key>`,
16-
see [docs](https://docs.gradle.com/enterprise/gradle-plugin/#via_environment_variable)
1713
- `GRADLE_PUBLISH_KEY`
1814
- `GRADLE_PUBLISH_SECRET`
1915
- `NVD_API_KEY` - stored in OpenTelemetry-Java 1Password
@@ -25,6 +21,7 @@ private admin repo.
2521

2622
### Organization secrets
2723

24+
- `DEVELOCITY_ACCESS_KEY`
2825
- `FOSSA_API_KEY`
2926
- `OTELBOT_PRIVATE_KEY`
3027
- `OTELBOT_JAVA_INSTRUMENTATION_PRIVATE_KEY`

‎.github/workflows/auto-spotless.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ permissions:
1414

1515
jobs:
1616
check:
17+
if: ${{ github.event.pull_request.draft == false }}
1718
runs-on: ubuntu-latest
1819
steps:
1920
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

‎docs/supported-libraries.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ These are the supported libraries and frameworks:
112112
| [NATS Client](https://github.com/nats-io/nats.java) | 2.17.2+ | [nats-2.17](../instrumentation/nats/nats-2.17/library) | [Messaging Spans] |
113113
| [Netty HTTP codec [5]](https://github.com/netty/netty) | 3.8+ | [opentelemetry-netty-4.1](../instrumentation/netty/netty-4.1/library) | [HTTP Client Spans], [HTTP Client Metrics], [HTTP Server Spans], [HTTP Server Metrics] |
114114
| [OpenAI Java SDK](https://github.com/openai/openai-java) | 1.1+ | [openai-java-1.1](../instrumentation/openai/openai-java-1.1/library) | [GenAI Client Spans], [GenAI Client Metrics] |
115+
| [OpenSearch Java Client](https://github.com/opensearch-project/opensearch-java) | 3.0+ | | [Database Client Spans], [Database Client Metrics]&nbsp;[6] |
115116
| [OpenSearch Rest Client](https://github.com/opensearch-project/opensearch-java) | 1.0+ | | [Database Client Spans], [Database Client Metrics]&nbsp;[6] |
116117
| [OkHttp](https://github.com/square/okhttp/) | 2.2+ | [opentelemetry-okhttp-3.0](../instrumentation/okhttp/okhttp-3.0/library) | [HTTP Client Spans], [HTTP Client Metrics] |
117118
| [Oracle UCP](https://docs.oracle.com/database/121/JJUCP/) | 11.2+ | [opentelemetry-oracle-ucp-11.2](../instrumentation/oracle-ucp-11.2/library) | [Database Pool Metrics] |

‎instrumentation/couchbase/couchbase-2.0/javaagent/build.gradle.kts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ dependencies {
2626

2727
testImplementation(project(":instrumentation:couchbase:couchbase-common:testing"))
2828

29+
testInstrumentation(project(":instrumentation:couchbase:couchbase-2.6:javaagent"))
30+
testInstrumentation(project(":instrumentation:couchbase:couchbase-3.1:javaagent"))
31+
testInstrumentation(project(":instrumentation:couchbase:couchbase-3.1.6:javaagent"))
32+
testInstrumentation(project(":instrumentation:couchbase:couchbase-3.2:javaagent"))
33+
testInstrumentation(project(":instrumentation:couchbase:couchbase-3.4:javaagent"))
34+
2935
latestDepTestLibrary("org.springframework.data:spring-data-couchbase:2.+") // see couchbase-2.6 module
3036
latestDepTestLibrary("com.couchbase.client:java-client:2.5.+") // see couchbase-2.6 module
3137
}

‎instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseInstrumentationModule.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.javaagent.instrumentation.couchbase.v2_0;
77

8+
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
89
import static java.util.Arrays.asList;
910
import static java.util.Collections.singletonList;
1011

@@ -13,6 +14,7 @@
1314
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1415
import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
1516
import java.util.List;
17+
import net.bytebuddy.matcher.ElementMatcher;
1618

1719
@AutoService(InstrumentationModule.class)
1820
public class CouchbaseInstrumentationModule extends InstrumentationModule
@@ -46,4 +48,10 @@ public List<String> injectedClassNames() {
4648
public boolean isIndyReady() {
4749
return true;
4850
}
51+
52+
@Override
53+
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
54+
// removed in 3.x
55+
return hasClassesNamed("com.couchbase.client.java.CouchbaseAsyncBucket");
56+
}
4957
}

‎instrumentation/couchbase/couchbase-2.6/javaagent/build.gradle.kts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,17 @@ dependencies {
2323

2424
library("com.couchbase.client:java-client:2.6.0")
2525

26-
testInstrumentation(project(":instrumentation:couchbase:couchbase-2.0:javaagent"))
2726
testImplementation(project(":instrumentation:couchbase:couchbase-common:testing"))
2827

2928
testLibrary("org.springframework.data:spring-data-couchbase:3.1.0.RELEASE")
3029
testLibrary("com.couchbase.client:encryption:1.0.0")
3130

31+
testInstrumentation(project(":instrumentation:couchbase:couchbase-2.0:javaagent"))
32+
testInstrumentation(project(":instrumentation:couchbase:couchbase-3.1:javaagent"))
33+
testInstrumentation(project(":instrumentation:couchbase:couchbase-3.1.6:javaagent"))
34+
testInstrumentation(project(":instrumentation:couchbase:couchbase-3.2:javaagent"))
35+
testInstrumentation(project(":instrumentation:couchbase:couchbase-3.4:javaagent"))
36+
3237
latestDepTestLibrary("org.springframework.data:spring-data-couchbase:3.1.+") // see couchbase-3.1 module
3338
latestDepTestLibrary("com.couchbase.client:java-client:2.+") // see couchbase-3.1 module
3439
}

‎instrumentation/couchbase/couchbase-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/CouchbaseInstrumentationModule.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@
55

66
package io.opentelemetry.javaagent.instrumentation.couchbase.v2_6;
77

8+
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
89
import static java.util.Arrays.asList;
910

1011
import com.google.auto.service.AutoService;
1112
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1213
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1314
import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
1415
import java.util.List;
16+
import net.bytebuddy.matcher.ElementMatcher;
1517

1618
@AutoService(InstrumentationModule.class)
1719
public class CouchbaseInstrumentationModule extends InstrumentationModule
@@ -21,6 +23,12 @@ public CouchbaseInstrumentationModule() {
2123
super("couchbase", "couchbase-2.6");
2224
}
2325

26+
@Override
27+
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
28+
// introduced in java-client 2.6, removed in 3.x
29+
return hasClassesNamed("com.couchbase.client.java.auth.CertAuthenticator");
30+
}
31+
2432
@Override
2533
public List<TypeInstrumentation> typeInstrumentations() {
2634
return asList(new CouchbaseCoreInstrumentation(), new CouchbaseNetworkInstrumentation());

‎instrumentation/couchbase/couchbase-3.1.6/javaagent/build.gradle.kts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ dependencies {
3333

3434
library("com.couchbase.client:java-client:3.1.6")
3535

36+
testInstrumentation(project(":instrumentation:couchbase:couchbase-2.0:javaagent"))
37+
testInstrumentation(project(":instrumentation:couchbase:couchbase-2.6:javaagent"))
38+
testInstrumentation(project(":instrumentation:couchbase:couchbase-3.1:javaagent"))
39+
testInstrumentation(project(":instrumentation:couchbase:couchbase-3.2:javaagent"))
40+
testInstrumentation(project(":instrumentation:couchbase:couchbase-3.4:javaagent"))
3641
testImplementation("org.testcontainers:testcontainers-couchbase")
3742

3843
latestDepTestLibrary("com.couchbase.client:java-client:3.1.+") // see couchbase-3.2 module

0 commit comments

Comments
 (0)