Prepre to release beta 8 (#33740)

* Prepre to release beta 8 * Use awaitility * Push pom change * Verify verison in pom * Fix banned dependency * Fix pom * Fix pom
Azure · Feb 25, 2023 · 6c9c6d9 · 6c9c6d9
1 parent 019a655
commit 6c9c6d9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt
@@ -232,6 +232,7 @@ org.openjdk.jmh:jmh-core;1.22
 org.openjdk.jmh:jmh-generator-annprocess;1.22
 org.spockframework:spock-core;2.3-groovy-4.0
 org.testng:testng;7.5
+org.awaitility:awaitility;4.2.0
 uk.org.lidalia:slf4j-test;1.2.0
 uk.org.webcompere:system-stubs-jupiter;2.0.1
 com.google.truth:truth;1.1.3

diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md b/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md
@@ -1,14 +1,12 @@
 # Release History
 
-## 1.0.0-beta.8 (Unreleased)
+## 1.0.0-beta.8 (2023-02-24)
 
-### Features Added
-
-### Breaking Changes
+### Dependency Update
+- Update OpenTelemetry Java Instrumentation to 1.23.0
 
 ### Bugs Fixed
-
-### Other Changes
+- [Fix GlobalOpenTelemetry usage](https://github.com/Azure/azure-sdk-for-java/pull/33678)
 
 ## 1.0.0-beta.7 (2023-02-09)
 

diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/pom.xml b/sdk/monitor/azure-monitor-opentelemetry-exporter/pom.xml
@@ -151,7 +151,11 @@
       <version>1.8.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
-
+    <dependency>
+      <groupId>org.awaitility</groupId>
+      <artifactId>awaitility</artifactId>
+      <version>4.2.0</version> <!-- {x-version-update;org.awaitility:awaitility;external_dependency} -->
+    </dependency>
   </dependencies>
 
   <build>
@@ -168,6 +172,7 @@
                 <include>io.opentelemetry:opentelemetry-sdk:[1.23.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-sdk;external_dependency} -->
                 <include>io.opentelemetry:opentelemetry-sdk-logs:[1.23.0-alpha]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-sdk-logs;external_dependency} -->
                 <include>com.github.spotbugs:spotbugs-annotations:[4.2.2]</include> <!-- {x-include-update;com.github.spotbugs:spotbugs-annotations;external_dependency} -->
+                <include>org.awaitility:awaitility:[4.2.0]</include> <!-- {x-include-update;org.awaitility:awaitility;external_dependency} -->
               </includes>
             </bannedDependencies>
           </rules>

diff --git a/...ava/com/azure/monitor/opentelemetry/exporter/implementation/heartbeat/HeartbeatTests.java b/...ava/com/azure/monitor/opentelemetry/exporter/implementation/heartbeat/HeartbeatTests.java
@@ -18,6 +18,7 @@
 import java.util.function.Consumer;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
 
 class HeartbeatTests {
 
@@ -30,8 +31,7 @@ void heartBeatPayloadContainsDataByDefault() throws InterruptedException {
         HeartbeatExporter provider = new HeartbeatExporter(60, (b, r) -> {
         }, telemetryItemsConsumer);
 
-        // some of the initialization above happens in a separate thread
-        Thread.sleep(2000);
+        await().until(() -> ((MetricsData) provider.gatherData().getData().getBaseData()).getProperties().size() > 0);
 
         // then
         MetricsData data = (MetricsData) provider.gatherData().getData().getBaseData();