Skip to content

[WIP] Checkout files from declarative configuration branch#100

Closed
Copilot wants to merge 2 commits intomainfrom
copilot/checkout-jms-kafka-nats-files
Closed

[WIP] Checkout files from declarative configuration branch#100
Copilot wants to merge 2 commits intomainfrom
copilot/checkout-jms-kafka-nats-files

Conversation

Copy link
Copy Markdown

Copilot AI commented Dec 16, 2025

  • Create new branch declarative-config/b-messaging based on origin/main
  • Checkout files from declarative-configuration-bridge for all messaging-related instrumentations
  • Add new DeclarativeConfigUtil API files from simplified-declarative-config-api-option-b branch
  • Update DeclarativeConfigUtil usages to use new API pattern from PR Remove AgentInstrumentationConfig usages: Scheduling open-telemetry/opentelemetry-java-instrumentation#15674
    • Update JMS 1.1 JmsSingletons.java
    • Update JMS 3.0 JmsSingletons.java
    • Update JMS common JmsReceiveSpanUtil.java
    • Update Kafka clients KafkaSingletons.java
    • Update Kafka streams KafkaStreamsSingletons.java
    • Update Nats NatsSingletons.java
    • Update Pulsar PulsarSingletons.java
    • Update RabbitMQ RabbitInstrumenterHelper.java
    • Update RabbitMQ RabbitSingletons.java
    • Update Reactor Kafka ReactorKafkaSingletons.java
    • Update RocketMQ 4.8 RocketMqClientHooks.java
    • Update RocketMQ 5.0 RocketMqSingletons.java
    • Update Spring JMS 2.0 SpringJmsSingletons.java
    • Update Spring JMS 6.0 SpringJmsSingletons.java
    • Update Spring Kafka SpringKafkaSingletons.java
    • Update Spring Pulsar SpringPulsarSingletons.java
    • Update Spring Rabbit SpringRabbitSingletons.java
    • Update Vertx Kafka VertxKafkaSingletons.java
  • Run tests for all updated modules to verify changes
Original prompt

checkout new branch declarative-config/b-messaging based on upstream/main

git checkout these files from declarative-configuration-branch:

instrumentation/jms/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/JmsSingletons.java
instrumentation/jms/jms-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/JmsSingletons.java
instrumentation/jms/jms-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsReceiveSpanUtil.java
instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/v0_11/KafkaSingletons.java
instrumentation/kafka/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsSingletons.java
instrumentation/nats/nats-2.17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/nats/v2_17/NatsSingletons.java
instrumentation/pulsar/pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarSingletons.java
instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitInstrumenterHelper.java
instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitSingletons.java
instrumentation/reactor/reactor-kafka-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/ReactorKafkaSingletons.java
instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v4_8/RocketMqClientHooks.java
instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqSingletons.java
instrumentation/spring/spring-jms/spring-jms-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v2_0/SpringJmsSingletons.java
instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringJmsSingletons.java
instrumentation/spring/spring-kafka-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaSingletons.java
instrumentation/spring/spring-pulsar-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_0/SpringPulsarSingletons.java
instrumentation/spring/spring-rabbit-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/SpringRabbitSingletons.java
instrumentation/vertx/vertx-kafka-client-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/VertxKafkaSingletons.java

update all DeclarativeConfigUtil usages in those files to use new API, see open-telemetry#15674

run tests for all updated modules (in one ./gradlew command) to verify

The user has attached the following file paths as relevant context:

  • .github\copilot-instructions.md

Created from VS Code.


💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.

…ntations

Co-authored-by: trask <218610+trask@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants