Skip to content

Commit 481219f

Browse files
trasktrask
committed
Test against latest azure sdk snapshot
1 parent 5304e26 commit 481219f

File tree

6 files changed

+247
-4
lines changed

6 files changed

+247
-4
lines changed

‎.github/workflows/build-common.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
required: false
99

1010
env:
11-
EXPORTER_VERSION: 1.0.0-beta.28 # to be updated with the latest version
11+
EXPORTER_VERSION: 1.0.0-beta.30 # to be updated with the latest version
1212

1313
jobs:
1414
spotless:

‎agent/agent-tooling/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies {
2121
implementation(project(":agent:agent-profiler:agent-diagnostics"))
2222
implementation(project(":etw:java"))
2323

24-
implementation("com.azure:azure-monitor-opentelemetry-exporter:1.0.0-beta.29")
24+
implementation("com.azure:azure-monitor-opentelemetry-exporter:1.0.0-beta.30")
2525
compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap")
2626
compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling")
2727
compileOnly("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common-bootstrap")

‎agent/agent-tooling/gradle.lockfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ com.azure:azure-core-http-netty:1.15.4=runtimeClasspath
99
com.azure:azure-core:1.52.0=runtimeClasspath
1010
com.azure:azure-identity:1.13.3=runtimeClasspath
1111
com.azure:azure-json:1.3.0=runtimeClasspath
12-
com.azure:azure-monitor-opentelemetry-exporter:1.0.0-beta.29=runtimeClasspath
12+
com.azure:azure-monitor-opentelemetry-exporter:1.0.0-beta.30=runtimeClasspath
1313
com.azure:azure-sdk-bom:1.2.28=runtimeClasspath
1414
com.azure:azure-storage-blob:12.28.0=runtimeClasspath
1515
com.azure:azure-storage-common:12.27.0=runtimeClasspath

‎azure-monitor-opentelemetry-exporter-1.0.0-beta.30.jar‎

427 KB
Binary file not shown.

‎azure-monitor-opentelemetry-exporter-1.0.0-beta.30.pom‎

Lines changed: 243 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,243 @@
1+
<!-- Copyright (c) Microsoft Corporation. All rights reserved.
2+
Licensed under the MIT License. -->
3+
4+
<project xmlns="http://maven.apache.org/POM/4.0.0"
5+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
6+
<modelVersion>4.0.0</modelVersion>
7+
8+
<parent>
9+
<groupId>com.azure</groupId>
10+
<artifactId>azure-client-sdk-parent</artifactId>
11+
<version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
12+
<relativePath>../../parents/azure-client-sdk-parent</relativePath>
13+
</parent>
14+
15+
<groupId>com.azure</groupId>
16+
<artifactId>azure-monitor-opentelemetry-exporter</artifactId>
17+
<version>1.0.0-beta.30</version> <!-- {x-version-update;com.azure:azure-monitor-opentelemetry-exporter;current} -->
18+
19+
<name>Microsoft Azure SDK for OpenTelemetry Azure Monitor Exporter</name>
20+
<description>This package contains Microsoft Azure SDK for OpenTelemetry Azure Monitor Exporter.</description>
21+
22+
<distributionManagement>
23+
<site>
24+
<id>azure-java-build-docs</id>
25+
<url>${site.url}/site/${project.artifactId}</url>
26+
</site>
27+
</distributionManagement>
28+
29+
<scm>
30+
<url>https://github.com/Azure/azure-sdk-for-java</url>
31+
</scm>
32+
33+
<properties>
34+
<jacoco.min.linecoverage>0.30</jacoco.min.linecoverage>
35+
<jacoco.min.branchcoverage>0.20</jacoco.min.branchcoverage>
36+
<!-- Configures the Java 9+ run to perform the required module exports, opens, and reads that are necessary for testing but shouldn't be part of the module-info. -->
37+
<javaModulesSurefireArgLine>
38+
--add-opens com.azure.monitor.opentelemetry.exporter/com.azure.monitor.opentelemetry.exporter=ALL-UNNAMED
39+
</javaModulesSurefireArgLine>
40+
<checkstyle.excludes>**/implementation/**/*.java</checkstyle.excludes>
41+
<spotless.skip>false</spotless.skip>
42+
</properties>
43+
44+
<dependencies>
45+
<dependency>
46+
<groupId>com.azure</groupId>
47+
<artifactId>azure-core</artifactId>
48+
<version>1.53.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
49+
</dependency>
50+
<dependency>
51+
<groupId>com.azure</groupId>
52+
<artifactId>azure-json</artifactId>
53+
<version>1.3.0</version> <!-- {x-version-update;com.azure:azure-json;dependency} -->
54+
</dependency>
55+
<dependency>
56+
<groupId>com.azure</groupId>
57+
<artifactId>azure-core-http-netty</artifactId>
58+
<version>1.15.5</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
59+
</dependency>
60+
<dependency>
61+
<groupId>io.opentelemetry</groupId>
62+
<artifactId>opentelemetry-api</artifactId>
63+
<version>1.42.1</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
64+
</dependency>
65+
<dependency>
66+
<groupId>io.opentelemetry</groupId>
67+
<artifactId>opentelemetry-sdk</artifactId>
68+
<version>1.42.1</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk;external_dependency} -->
69+
</dependency>
70+
<dependency>
71+
<groupId>io.opentelemetry</groupId>
72+
<artifactId>opentelemetry-sdk-metrics</artifactId>
73+
<version>1.42.1</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk-metrics;external_dependency} -->
74+
</dependency>
75+
<dependency>
76+
<groupId>io.opentelemetry</groupId>
77+
<artifactId>opentelemetry-sdk-logs</artifactId>
78+
<version>1.42.1</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk-logs;external_dependency} -->
79+
</dependency>
80+
<dependency>
81+
<groupId>io.opentelemetry</groupId>
82+
<artifactId>opentelemetry-sdk-extension-autoconfigure-spi</artifactId>
83+
<version>1.42.1</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi;external_dependency} -->
84+
</dependency>
85+
<dependency>
86+
<groupId>io.opentelemetry</groupId>
87+
<artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
88+
<version>1.42.1</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk-extension-autoconfigure;external_dependency} -->
89+
</dependency>
90+
<dependency>
91+
<groupId>io.opentelemetry.semconv</groupId>
92+
<artifactId>opentelemetry-semconv-incubating</artifactId>
93+
<version>1.26.0-alpha</version> <!-- {x-version-update;io.opentelemetry.semconv:opentelemetry-semconv-incubating;external_dependency} -->
94+
</dependency>
95+
96+
<!-- Added this dependency to include necessary annotations used by reactor core.
97+
Without this dependency, javadoc throws a warning as it cannot find enum When.MAYBE
98+
which is used in @Nullable annotation in reactor core classes -->
99+
<dependency>
100+
<groupId>com.google.code.findbugs</groupId>
101+
<artifactId>jsr305</artifactId>
102+
<version>3.0.2</version> <!-- {x-version-update;com.google.code.findbugs:jsr305;external_dependency} -->
103+
<scope>provided</scope>
104+
</dependency>
105+
106+
<!-- Test dependencies -->
107+
<dependency>
108+
<groupId>org.assertj</groupId>
109+
<artifactId>assertj-core</artifactId>
110+
<version>3.22.0</version> <!-- {x-version-update;org.assertj:assertj-core;external_dependency} -->
111+
<scope>test</scope>
112+
</dependency>
113+
<dependency>
114+
<groupId>org.mockito</groupId>
115+
<artifactId>mockito-core</artifactId>
116+
<version>4.11.0</version> <!-- {x-version-update;org.mockito:mockito-core;external_dependency} -->
117+
<scope>test</scope>
118+
</dependency>
119+
<!-- bytebuddy dependencies are required for mockito 4.11.0 to work with Java 21. Mockito 4.11.0 is the last release -->
120+
<!-- of Mockito supporting Java 8 as a baseline. -->
121+
<dependency>
122+
<groupId>net.bytebuddy</groupId>
123+
<artifactId>byte-buddy</artifactId>
124+
<version>1.14.12</version> <!-- {x-version-update;testdep_net.bytebuddy:byte-buddy;external_dependency} -->
125+
<scope>test</scope>
126+
</dependency>
127+
<dependency>
128+
<groupId>net.bytebuddy</groupId>
129+
<artifactId>byte-buddy-agent</artifactId>
130+
<version>1.14.12</version> <!-- {x-version-update;testdep_net.bytebuddy:byte-buddy-agent;external_dependency} -->
131+
<scope>test</scope>
132+
</dependency>
133+
<dependency>
134+
<groupId>io.opentelemetry</groupId>
135+
<artifactId>opentelemetry-sdk-testing</artifactId>
136+
<version>1.42.1</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-sdk-testing;external_dependency} -->
137+
<scope>test</scope>
138+
</dependency>
139+
<dependency>
140+
<groupId>com.azure</groupId>
141+
<artifactId>azure-data-appconfiguration</artifactId>
142+
<version>1.7.1</version> <!-- {x-version-update;com.azure:azure-data-appconfiguration;dependency} -->
143+
<scope>test</scope>
144+
</dependency>
145+
<dependency>
146+
<groupId>com.azure</groupId>
147+
<artifactId>azure-messaging-eventhubs</artifactId>
148+
<version>5.19.0</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;dependency} -->
149+
<scope>test</scope>
150+
</dependency>
151+
<dependency>
152+
<groupId>com.azure</groupId>
153+
<artifactId>azure-core-tracing-opentelemetry</artifactId>
154+
<version>1.0.0-beta.50</version> <!-- {x-version-update;com.azure:azure-core-tracing-opentelemetry;dependency} -->
155+
<scope>test</scope>
156+
</dependency>
157+
<dependency>
158+
<groupId>com.azure</groupId>
159+
<artifactId>azure-core-test</artifactId>
160+
<version>1.27.0-beta.2</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
161+
<scope>test</scope>
162+
<exclusions>
163+
<exclusion>
164+
<groupId>com.azure</groupId>
165+
<artifactId>azure-core-http-jdk-httpclient</artifactId>
166+
</exclusion>
167+
</exclusions>
168+
</dependency>
169+
<dependency>
170+
<groupId>com.azure</groupId>
171+
<artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId>
172+
<version>1.20.0</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;dependency} -->
173+
<scope>test</scope>
174+
</dependency>
175+
<dependency>
176+
<groupId>com.azure</groupId>
177+
<artifactId>azure-identity</artifactId>
178+
<version>1.14.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
179+
<scope>test</scope>
180+
</dependency>
181+
<dependency>
182+
<groupId>org.awaitility</groupId>
183+
<artifactId>awaitility</artifactId>
184+
<version>4.2.0</version> <!-- {x-version-update;org.awaitility:awaitility;external_dependency} -->
185+
<scope>test</scope>
186+
</dependency>
187+
<dependency>
188+
<groupId>io.github.hakky54</groupId>
189+
<artifactId>logcaptor</artifactId>
190+
<version>2.9.0</version> <!-- {x-version-update;io.github.hakky54:logcaptor;external_dependency} -->
191+
<scope>test</scope>
192+
</dependency>
193+
<dependency>
194+
<groupId>com.squareup.okio</groupId>
195+
<artifactId>okio</artifactId>
196+
<version>3.9.0</version> <!-- {x-version-update;com.squareup.okio:okio;external_dependency} -->
197+
<scope>test</scope>
198+
</dependency>
199+
</dependencies>
200+
201+
<build>
202+
<plugins>
203+
<plugin>
204+
<groupId>org.apache.maven.plugins</groupId>
205+
<artifactId>maven-enforcer-plugin</artifactId>
206+
<version>3.4.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-enforcer-plugin;external_dependency} -->
207+
<configuration>
208+
<rules>
209+
<bannedDependencies>
210+
<includes>
211+
<include>io.opentelemetry:opentelemetry-api:[1.42.1]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
212+
<include>io.opentelemetry:opentelemetry-sdk:[1.42.1]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-sdk;external_dependency} -->
213+
<include>io.opentelemetry:opentelemetry-sdk-metrics:[1.42.1]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-sdk-metrics;external_dependency} -->
214+
<include>io.opentelemetry:opentelemetry-sdk-logs:[1.42.1]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-sdk-logs;external_dependency} -->
215+
<include>io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:[1.42.1]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi;external_dependency} -->
216+
<include>io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:[1.42.1]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-sdk-extension-autoconfigure;external_dependency} -->
217+
<include>io.opentelemetry.semconv:opentelemetry-semconv-incubating:[1.26.0-alpha]</include> <!-- {x-include-update;io.opentelemetry.semconv:opentelemetry-semconv-incubating;external_dependency} -->
218+
<include>com.squareup.okio:okio:[3.9.0]</include> <!-- {x-include-update;com.squareup.okio:okio;external_dependency} -->
219+
</includes>
220+
</bannedDependencies>
221+
</rules>
222+
</configuration>
223+
</plugin>
224+
</plugins>
225+
</build>
226+
227+
<profiles>
228+
<profile>
229+
<id>java12plus</id>
230+
<activation>
231+
<jdk>[12,)</jdk>
232+
</activation>
233+
<dependencies>
234+
<dependency>
235+
<groupId>com.azure</groupId>
236+
<artifactId>azure-core-http-jdk-httpclient</artifactId>
237+
<version>1.0.0-beta.17</version> <!-- {x-version-update;com.azure:azure-core-http-jdk-httpclient;dependency} -->
238+
<scope>test</scope>
239+
</dependency>
240+
</dependencies>
241+
</profile>
242+
</profiles>
243+
</project>

‎licenses/more-licenses.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ _2024-10-03 17:11:31 UTC_
362362
> - **POM Project URL**: [https://github.com/Azure/azure-sdk-for-java](https://github.com/Azure/azure-sdk-for-java)
363363
> - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT)
364364
365-
**70** **Group:** `com.azure` **Name:** `azure-monitor-opentelemetry-exporter` **Version:** `1.0.0-beta.29`
365+
**70** **Group:** `com.azure` **Name:** `azure-monitor-opentelemetry-exporter` **Version:** `1.0.0-beta.30`
366366
> - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT)
367367
368368
**71** **Group:** `com.azure` **Name:** `azure-storage-blob` **Version:** `12.28.0`

0 commit comments

Comments
 (0)