File tree Expand file tree Collapse file tree 3 files changed +2
-12
lines changed
src/test/java/com/google/cloud/firestore/it Expand file tree Collapse file tree 3 files changed +2
-12
lines changed Original file line number Diff line number Diff line change 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 >
Original file line number Diff line number Diff line change 3434import static com .google .cloud .firestore .telemetry .TelemetryConstants .METHOD_NAME_TRANSACTION_GET_QUERY ;
3535import static com .google .cloud .firestore .telemetry .TelemetryConstants .METHOD_NAME_TRANSACTION_ROLLBACK ;
3636import static com .google .cloud .firestore .telemetry .TelemetryConstants .METHOD_NAME_TRANSACTION_RUN ;
37- import static io .opentelemetry .semconv .ResourceAttributes .SERVICE_NAME ;
3837import static org .junit .Assert .assertEquals ;
3938import static org .junit .Assert .assertFalse ;
4039import 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 ();
Original file line number Diff line number Diff line change 1818
1919import static com .google .cloud .firestore .telemetry .TelemetryConstants .*;
2020import static com .google .cloud .firestore .telemetry .TraceUtil .*;
21- import static io .opentelemetry .semconv .ResourceAttributes .SERVICE_NAME ;
2221import static org .junit .Assert .assertEquals ;
2322import static org .junit .Assert .assertNotNull ;
2423import 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 =
You can’t perform that action at this time.
0 commit comments