Skip to content

Commit 3767e36

Browse files
renovate-bottom-andersenehsannas
authored
deps: update dependency io.opentelemetry.semconv:opentelemetry-semconv to v1.30.0 (#2022)
* deps: update dependency io.opentelemetry.semconv:opentelemetry-semconv to v1.30.0 * Fix the SERVICE_NAME static import. * Remove unnecessary test dependency. --------- Co-authored-by: Tom Andersen <[email protected]> Co-authored-by: Ehsan Nasiri <[email protected]>
1 parent 9f1ae28 commit 3767e36

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

google-cloud-firestore/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -223,12 +223,6 @@
223223
<version>0.33.0</version>
224224
<scope>test</scope>
225225
</dependency>
226-
<dependency>
227-
<groupId>io.opentelemetry.semconv</groupId>
228-
<artifactId>opentelemetry-semconv</artifactId>
229-
<version>1.26.0-alpha</version>
230-
<scope>test</scope>
231-
</dependency>
232226
<!-- END OpenTelemetry -->
233227
<!-- Cloud Ops -->
234228
<dependency>

google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITE2ETracingTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import static com.google.cloud.firestore.telemetry.TelemetryConstants.METHOD_NAME_TRANSACTION_GET_QUERY;
3535
import static com.google.cloud.firestore.telemetry.TelemetryConstants.METHOD_NAME_TRANSACTION_ROLLBACK;
3636
import static com.google.cloud.firestore.telemetry.TelemetryConstants.METHOD_NAME_TRANSACTION_RUN;
37-
import static io.opentelemetry.semconv.ResourceAttributes.SERVICE_NAME;
3837
import static org.junit.Assert.assertEquals;
3938
import static org.junit.Assert.assertFalse;
4039
import static org.junit.Assert.assertNotNull;
@@ -290,8 +289,7 @@ public static void setup() throws IOException {
290289
@Before
291290
public void before() throws Exception {
292291
// Set up OTel SDK
293-
Resource resource =
294-
Resource.getDefault().merge(Resource.builder().put(SERVICE_NAME, "Sparky").build());
292+
Resource resource = Resource.getDefault();
295293

296294
if (isUsingGlobalOpenTelemetrySDK()) {
297295
GlobalOpenTelemetry.resetForTest();

google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITTracingTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import static com.google.cloud.firestore.telemetry.TelemetryConstants.*;
2020
import static com.google.cloud.firestore.telemetry.TraceUtil.*;
21-
import static io.opentelemetry.semconv.ResourceAttributes.SERVICE_NAME;
2221
import static org.junit.Assert.assertEquals;
2322
import static org.junit.Assert.assertNotNull;
2423
import static org.junit.Assert.assertTrue;
@@ -108,8 +107,7 @@ public abstract class ITTracingTest {
108107
public void before() {
109108
inMemorySpanExporter = InMemorySpanExporter.create();
110109

111-
Resource resource =
112-
Resource.getDefault().merge(Resource.builder().put(SERVICE_NAME, "Sparky").build());
110+
Resource resource = Resource.getDefault();
113111
SpanProcessor inMemorySpanProcessor = SimpleSpanProcessor.create(inMemorySpanExporter);
114112
FirestoreOptions.Builder optionsBuilder = FirestoreOptions.newBuilder();
115113
FirestoreOpenTelemetryOptions.Builder otelOptionsBuilder =

0 commit comments

Comments
 (0)