SOL-103114 & SOL-103115 Update otel versions for jcsmp/jms (#260)

* SOL-103114 & SOL-103115 Update otel versions for jcsmp/jms * version modifications * export html --------- Co-authored-by: Tamimi <[email protected]>
SolaceDev · Oct 6, 2023 · 47e5f98 · 47e5f98 · github-actions · Oct 9, 2023
1 parent c62b2c9
commit 47e5f98
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/codelabs/dt-otel/codelab.json b/codelabs/dt-otel/codelab.json
@@ -3,7 +3,7 @@
   "format": "html",
   "prefix": "https://storage.googleapis.com",
   "mainga": "UA-49880327-14",
-  "updated": "2023-05-17T14:50:52-04:00",
+  "updated": "2023-10-06T12:44:20-04:00",
   "id": "dt-otel",
   "duration": 89,
   "title": "Getting Started with Solace Distributed Tracing and Context Propagation",

diff --git a/codelabs/dt-otel/index.html b/codelabs/dt-otel/index.html
@@ -78,8 +78,8 @@ <h2 is-upgraded>Source code</h2>
 <li><code>.env</code> (file with environment variables used in a docker compose files)</li>
 <li><code>solace-publisher.jar</code> (command line Solace jms application for publishing of messages)</li>
 <li><code>solace-queue-receiver.jar</code> (command line Solace jms application for receiving of messages from a JMS Queue)</li>
-<li><code>opentelemetry-javaagent-all-{version}.jar</code> OpenTelemetry Java Instrumentation API</li>
-<li><code>solace-opentelemetry-jms-integration-{version}.jar</code> <a href="https://repo1.maven.org/maven2/com/solace/solace-opentelemetry-jms-integration/1.0.0/solace-opentelemetry-jms-integration-1.0.0.jar" target="_blank">Solace PubSub+ OpenTelemetry Integration API for JMS</a></li>
+<li><code>opentelemetry-javaagent.jar</code> OpenTelemetry Java Instrumentation API</li>
+<li><code>solace-opentelemetry-jms-integration-{version}.jar</code> <a href="https://repo1.maven.org/maven2/com/solace/solace-opentelemetry-jms-integration/1.1.0/solace-opentelemetry-jms-integration-1.1.0.jar" target="_blank">Solace PubSub+ OpenTelemetry Integration API for JMS</a></li>
 <li><code>jms-auto-instrumentation-sampler-sources.jar</code> (Source code for the Solace jms application for publishing and receiving messages)</li>
 </ul>
 <p>To get access to the above resources, clone the repository as follows</p>
@@ -120,9 +120,9 @@ <h2 is-upgraded>Source code</h2>
 <h2 is-upgraded>Few notes to the code lab configuration</h2>
 <p>The <code>.env</code> file contains several environment variables that are used within the <code>docker-compose.yaml</code> file and may need to be changed by user depends on the runtime environment:</p>
 <ul>
-<li>Solace Pub Sub Plus broker port <code>55557</code></li>
-<li>OpenTelemetry contribution repository collector docker image tag and version <code>otel/opentelemetry-collector-contrib:0.67.0</code></li>
-<li>Solace PubSub+ broker docker image tag and version <code>solace/solace-pubsub-standard:10.2</code></li>
+<li>Solace PubSub+ broker port <code>55557</code></li>
+<li>OpenTelemetry contribution repository collector docker image tag and version for <code>otel/opentelemetry-collector-contrib</code></li>
+<li>Solace PubSub+ broker docker image tag and version <code>solace/solace-pubsub-standard</code></li>
 </ul>
 
 
@@ -656,8 +656,8 @@ <h2 is-upgraded>Run the publisher with context propagation enabled</h2>
 </ul>
 </aside>
 <pre><code language="language-bash" class="language-bash">[solace@dev solace-dt-demo]$ 
-java -javaagent:&lt;absolute_path_to_the_jar_file&gt;/opentelemetry-javaagent-all-1.19.0.jar \
--Dotel.javaagent.extensions=&lt;absolute_path_to_the_jar_file&gt;/solace-opentelemetry-jms-integration-1.0.0.jar \
+java -javaagent:&lt;absolute_path_to_the_jar_file&gt;/opentelemetry-javaagent.jar \
+-Dotel.javaagent.extensions=&lt;absolute_path_to_the_jar_file&gt;/solace-opentelemetry-jms-integration-1.1.0.jar \
 -Dotel.propagators=solace_jms_tracecontext \
 -Dotel.exporter.otlp.endpoint=http://localhost:4317 \
 -Dotel.traces.exporter=otlp \
@@ -685,8 +685,8 @@ <h2 is-upgraded>Run the subscriber with context propagation enabled</h2>
 </ul>
 </aside>
 <pre><code language="language-bash" class="language-bash">[solace@dev solace-dt-demo]$ 
-java -javaagent:&lt;absolute_path_to_the_jar_file&gt;/opentelemetry-javaagent-all-1.19.0.jar \
--Dotel.javaagent.extensions=&lt;absolute_path_to_the_jar_file&gt;/solace-opentelemetry-jms-integration-1.0.0.jar \
+java -javaagent:&lt;absolute_path_to_the_jar_file&gt;/opentelemetry-javaagent.jar \
+-Dotel.javaagent.extensions=&lt;absolute_path_to_the_jar_file&gt;/solace-opentelemetry-jms-integration-1.1.0.jar \
 -Dotel.propagators=solace_jms_tracecontext \
 -Dotel.traces.exporter=otlp \
 -Dotel.metrics.exporter=none \

diff --git a/markdown/dt-otel/dt-otel.md b/markdown/dt-otel/dt-otel.md
@@ -74,8 +74,8 @@ The [solace-dt-demo repository](https://github.com/TamimiGitHub/solace-dt-demo)
 * `.env `(file with environment variables used in a docker compose files)
 * `solace-publisher.jar` (command line Solace jms application for publishing of messages)
 * `solace-queue-receiver.jar` (command line Solace jms application for receiving of messages from a JMS Queue)
-* `opentelemetry-javaagent-all-{version}.jar` OpenTelemetry Java Instrumentation API 
-* `solace-opentelemetry-jms-integration-{version}.jar` [Solace PubSub+ OpenTelemetry Integration API for JMS](https://repo1.maven.org/maven2/com/solace/solace-opentelemetry-jms-integration/1.0.0/solace-opentelemetry-jms-integration-1.0.0.jar)
+* `opentelemetry-javaagent.jar` OpenTelemetry Java Instrumentation API 
+* `solace-opentelemetry-jms-integration-{version}.jar` [Solace PubSub+ OpenTelemetry Integration API for JMS](https://repo1.maven.org/maven2/com/solace/solace-opentelemetry-jms-integration/1.1.0/solace-opentelemetry-jms-integration-1.1.0.jar)
 * `jms-auto-instrumentation-sampler-sources.jar` (Source code for the Solace jms application for publishing and receiving messages) 
 
 To get access to the above resources, clone the repository as follows
@@ -125,9 +125,9 @@ The following command will download and launch all containers necessary for the
 ###  Few notes to the code lab configuration
 The `.env` file contains several environment variables that are used within the `docker-compose.yaml` file and may need to be changed by user depends on the runtime environment: 
 
-* Solace Pub Sub Plus broker port `55557`
-* OpenTelemetry contribution repository collector docker image tag and version `otel/opentelemetry-collector-contrib:0.67.0`
-* Solace PubSub+ broker docker image tag and version `solace/solace-pubsub-standard:10.2`
+* Solace PubSub+ broker port `55557`
+* OpenTelemetry contribution repository collector docker image tag and version for `otel/opentelemetry-collector-contrib`
+* Solace PubSub+ broker docker image tag and version `solace/solace-pubsub-standard`
 
 ## Three Options for Config Management
 Duration: 0:03:00
@@ -816,8 +816,8 @@ Additional context information will be **automatically** sent to the collector w
 
 ```bash
 [solace@dev solace-dt-demo]$ 
-java -javaagent:<absolute_path_to_the_jar_file>/opentelemetry-javaagent-all-1.19.0.jar \
--Dotel.javaagent.extensions=<absolute_path_to_the_jar_file>/solace-opentelemetry-jms-integration-1.0.0.jar \
+java -javaagent:<absolute_path_to_the_jar_file>/opentelemetry-javaagent.jar \
+-Dotel.javaagent.extensions=<absolute_path_to_the_jar_file>/solace-opentelemetry-jms-integration-1.1.0.jar \
 -Dotel.propagators=solace_jms_tracecontext \
 -Dotel.exporter.otlp.endpoint=http://localhost:4317 \
 -Dotel.traces.exporter=otlp \
@@ -849,8 +849,8 @@ The following command will
 
 ```bash
 [solace@dev solace-dt-demo]$ 
-java -javaagent:<absolute_path_to_the_jar_file>/opentelemetry-javaagent-all-1.19.0.jar \
--Dotel.javaagent.extensions=<absolute_path_to_the_jar_file>/solace-opentelemetry-jms-integration-1.0.0.jar \
+java -javaagent:<absolute_path_to_the_jar_file>/opentelemetry-javaagent.jar \
+-Dotel.javaagent.extensions=<absolute_path_to_the_jar_file>/solace-opentelemetry-jms-integration-1.1.0.jar \
 -Dotel.propagators=solace_jms_tracecontext \
 -Dotel.traces.exporter=otlp \
 -Dotel.metrics.exporter=none \