Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepre to release beta 8 #33740

Merged
merged 7 commits into from
Feb 25, 2023
Merged

Prepre to release beta 8 #33740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5cce5ec
Prepre to release beta 8
heyams Feb 25, 2023
8a84a46
Use awaitility
heyams Feb 25, 2023
81e9ede
Push pom change
heyams Feb 25, 2023
9f62be5
Verify verison in pom
heyams Feb 25, 2023
71e2133
Fix banned dependency
heyams Feb 25, 2023
4af6f97
Fix pom
heyams Feb 25, 2023
1269505
Fix pom
heyams Feb 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions eng/versioning/external_dependencies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 4 additions & 6 deletions sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
7 changes: 6 additions & 1 deletion sdk/monitor/azure-monitor-opentelemetry-exporter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions ...ava/com/azure/monitor/opentelemetry/exporter/implementation/heartbeat/HeartbeatTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -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();
Expand Down