Skip to content

Commit f289e05

Browse files
AlixBaAlixBa
committed
rename nats-2.21 to nats-2.17
1 parent 1c88b1c commit f289e05

File tree

51 files changed

+100
-100
lines changed

Some content is hidden

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

51 files changed

+100
-100
lines changed

‎.fossa.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -699,10 +699,10 @@ targets:
699699
target: ':instrumentation:mongo:mongo-async-3.3:javaagent'
700700
- type: gradle
701701
path: ./
702-
target: ':instrumentation:nats:nats-2.21:javaagent'
702+
target: ':instrumentation:nats:nats-2.17:javaagent'
703703
- type: gradle
704704
path: ./
705-
target: ':instrumentation:nats:nats-2.21:library'
705+
target: ':instrumentation:nats:nats-2.17:library'
706706
- type: gradle
707707
path: ./
708708
target: ':instrumentation:netty:netty-3.8:javaagent'

‎.github/scripts/check-package-names.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ for dir in $(find instrumentation -name "*.java" | grep library/src/main/java |
2929
if [[ "$dir" == "instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/lettuce/core/protocol" ]]; then
3030
continue
3131
fi
32-
if [[ "$dir" == "instrumentation/nats/nats-2.21/library/src/main/java/io/nats/client/impl" ]]; then
32+
if [[ "$dir" == "instrumentation/nats/nats-2.17/library/src/main/java/io/nats/client/impl" ]]; then
3333
continue
3434
fi
3535

‎docs/instrumentation-list.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4172,17 +4172,17 @@ libraries:
41724172
javaagent:
41734173
- org.mybatis:mybatis:[3.2.0,)
41744174
nats:
4175-
- name: nats-2.21
4175+
- name: nats-2.17
41764176
description: This instrumentation provides messaging spans for NATS
4177-
disabled_by_default: true
4178-
source_path: instrumentation/nats/nats-2.21
4177+
disabled_by_default: false
4178+
source_path: instrumentation/nats/nats-2.17
41794179
scope:
4180-
name: io.opentelemetry.nats-2.21
4180+
name: io.opentelemetry.nats-2.17
41814181
target_versions:
41824182
javaagent:
41834183
- io.nats:jnats:[2.17.2,)
41844184
library:
4185-
- io.nats:jnats:2.21.0
4185+
- io.nats:jnats:2.21.5
41864186
configurations:
41874187
- name: otel.instrumentation.messaging.experimental.receive-telemetry.enabled
41884188
description: |

‎docs/supported-libraries.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ These are the supported libraries and frameworks:
105105
| [Micrometer](https://micrometer.io/) | 1.5+ (disabled by default) | [opentelemetry-micrometer-1.5](../instrumentation/micrometer/micrometer-1.5/library) | none |
106106
| [MongoDB Driver](https://mongodb.github.io/mongo-java-driver/) | 3.1+ | [opentelemetry-mongo-3.1](../instrumentation/mongo/mongo-3.1/library) | [Database Client Spans], [Database Client Metrics] [6] |
107107
| [MyBatis](https://mybatis.org/mybatis-3/) | 3.2+ | N/A | none |
108-
| [NATS](https://github.com/nats-io/nats.java) | 2.17.2+ | [nats-2.21](../instrumentation/nats/nats-2.21/library) | [Messaging Spans] |
108+
| [NATS](https://github.com/nats-io/nats.java) | 2.17.2+ | [nats-2.17](../instrumentation/nats/nats-2.17/library) | [Messaging Spans] |
109109
| [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] |
110110
| [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] |
111111
| [OpenSearch Rest Client](https://github.com/opensearch-project/opensearch-java) | 1.0+ | | [Database Client Spans], [Database Client Metrics] [6] |

‎instrumentation-docs/instrumentations.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ readonly INSTRUMENTATIONS=(
140140
"graphql-java:graphql-java-12.0:javaagent:test"
141141
"graphql-java:graphql-java-20.0:javaagent:test"
142142
"graphql-java:graphql-java-20.0:javaagent:testDataFetcher"
143-
"nats:nats-2.21:javaagent:test"
144-
"nats:nats-2.21:javaagent:testExperimental"
143+
"nats:nats-2.17:javaagent:test"
144+
"nats:nats-2.17:javaagent:testExperimental"
145145
)
146146

147147
# Some instrumentation test suites don't run ARM, so we use colima to run them in an x86_64

‎instrumentation/nats/nats-2.21/javaagent/README.md‎ renamed to ‎instrumentation/nats/nats-2.17/javaagent/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Auth-instrumentation for NATS version 2.21
1+
# Auth-instrumentation for NATS version 2.17
22

3-
Provides OpenTelemetry auto-instrumentation for [NATS 2.21](https://github.com/nats-io/nats.java).
3+
Provides OpenTelemetry auto-instrumentation for [NATS 2.17](https://github.com/nats-io/nats.java).
44

55
### Trace propagation
66

‎instrumentation/nats/nats-2.21/javaagent/build.gradle.kts‎ renamed to ‎instrumentation/nats/nats-2.17/javaagent/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ muzzle {
1616
}
1717

1818
dependencies {
19-
library("io.nats:jnats:2.21.0")
19+
library("io.nats:jnats:2.21.5")
2020

21-
implementation(project(":instrumentation:nats:nats-2.21:library"))
22-
testImplementation(project(":instrumentation:nats:nats-2.21:testing"))
21+
implementation(project(":instrumentation:nats:nats-2.17:library"))
22+
testImplementation(project(":instrumentation:nats:nats-2.17:testing"))
2323
}
2424

2525
val collectMetadata = findProperty("collectMetadata")?.toString() ?: "false"

‎instrumentation/nats/nats-2.21/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/nats/v2_21/CompletableFutureWrapper.java‎ renamed to ‎instrumentation/nats/nats-2.17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/nats/v2_17/CompletableFutureWrapper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.nats.v2_21;
6+
package io.opentelemetry.javaagent.instrumentation.nats.v2_17;
77

88
import io.opentelemetry.context.Context;
99
import io.opentelemetry.context.Scope;

‎instrumentation/nats/nats-2.21/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/nats/v2_21/ConnectionPublishInstrumentation.java‎ renamed to ‎instrumentation/nats/nats-2.17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/nats/v2_17/ConnectionPublishInstrumentation.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.nats.v2_21;
6+
package io.opentelemetry.javaagent.instrumentation.nats.v2_17;
77

88
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
9-
import static io.opentelemetry.javaagent.instrumentation.nats.v2_21.NatsSingletons.PRODUCER_INSTRUMENTER;
9+
import static io.opentelemetry.javaagent.instrumentation.nats.v2_17.NatsSingletons.PRODUCER_INSTRUMENTER;
1010
import static net.bytebuddy.matcher.ElementMatchers.isPublic;
1111
import static net.bytebuddy.matcher.ElementMatchers.named;
1212
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
@@ -17,7 +17,7 @@
1717
import io.nats.client.impl.Headers;
1818
import io.opentelemetry.context.Context;
1919
import io.opentelemetry.context.Scope;
20-
import io.opentelemetry.instrumentation.nats.v2_21.internal.NatsRequest;
20+
import io.opentelemetry.instrumentation.nats.v2_17.internal.NatsRequest;
2121
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
2222
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
2323
import net.bytebuddy.asm.Advice;

‎instrumentation/nats/nats-2.21/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/nats/v2_21/ConnectionRequestInstrumentation.java‎ renamed to ‎instrumentation/nats/nats-2.17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/nats/v2_17/ConnectionRequestInstrumentation.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.nats.v2_21;
6+
package io.opentelemetry.javaagent.instrumentation.nats.v2_17;
77

88
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
9-
import static io.opentelemetry.javaagent.instrumentation.nats.v2_21.NatsSingletons.PRODUCER_INSTRUMENTER;
9+
import static io.opentelemetry.javaagent.instrumentation.nats.v2_17.NatsSingletons.PRODUCER_INSTRUMENTER;
1010
import static net.bytebuddy.matcher.ElementMatchers.isPublic;
1111
import static net.bytebuddy.matcher.ElementMatchers.named;
1212
import static net.bytebuddy.matcher.ElementMatchers.returns;
@@ -18,7 +18,7 @@
1818
import io.nats.client.impl.Headers;
1919
import io.opentelemetry.context.Context;
2020
import io.opentelemetry.context.Scope;
21-
import io.opentelemetry.instrumentation.nats.v2_21.internal.NatsRequest;
21+
import io.opentelemetry.instrumentation.nats.v2_17.internal.NatsRequest;
2222
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
2323
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
2424
import java.time.Duration;

0 commit comments

Comments
 (0)