Skip to content

Commit

Permalink
Reduce number of tags for micrometer (#3511)
Browse files Browse the repository at this point in the history
  • Loading branch information
tomekl007 authored Mar 4, 2022
1 parent 8b54f89 commit 216d616
Show file tree
Hide file tree
Showing 2 changed files with 74 additions and 0 deletions.
12 changes: 12 additions & 0 deletions servers/quarkus-server/src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -175,3 +175,15 @@ quarkus.micrometer.binder.jvm=true

mp.openapi.extensions.smallrye.operationIdStrategy=METHOD

quarkus.micrometer.binder.http-server.match-patterns=\
/api/v1/diffs/.*+=/api/v1/diffs/{diff_params},\
/api/v1/trees/branch/.*/commit+=/api/v1/trees/branch/{branchName}/commit,\
/api/v1/trees/branch/.*+=/api/v1/trees/branch/{ref},\
/api/v1/trees/branch/.*/transplant+=/api/v1/trees/branch/{branchName}/transplant, \
/api/v1/trees/branch/.*/merge+=/api/v1/trees/branch/{branchName}/merge, \
/api/v1/trees/tree/.*/entries+=/api/v1/trees/tree/{ref}/entries,\
/api/v1/trees/tree/.*/log+=/api/v1/trees/tree/{ref}/log, \
/api/v1/trees/tree/.*+=/api/v1/trees/tree/{ref}, \
/api/v1/trees/.*/.*+=/api/v1/trees/{referenceType}/{ref}, \
/contents/.*+=/contents/{key}

Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
/*
* Copyright (C) 2022 Dremio
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.projectnessie.server;

import static org.assertj.core.api.AssertionsForClassTypes.assertThat;

import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
import io.restassured.RestAssured;
import org.junit.jupiter.api.Test;
import org.projectnessie.jaxrs.AbstractTestRest;
import org.projectnessie.server.profiles.QuarkusTestProfileInmemory;

@QuarkusTest
@TestProfile(value = QuarkusTestProfileInmemory.class)
public class ITMetrics extends AbstractTestRest {
// We need to extend the AbstractTestRest because all Nessie metrics are created lazily.
// They will appear in the `/q/metrics` endpoint only when some REST actions are executed.

// this test is executed after all tests from the AbstractTestRest
@Test
void smokeTestMetrics() {
// when
String body =
RestAssured.given()
.when()
.basePath("/q/metrics")
.get()
.then()
.statusCode(200)
.extract()
.asString();

// then
assertThat(body).contains("jvm_threads_live_threads");
assertThat(body).contains("jvm_memory_committed_bytes");
assertThat(body).contains("nessie_versionstore_request_seconds_max");
assertThat(body).contains("nessie_versionstore_request_seconds_bucket");
assertThat(body).contains("nessie_versionstore_request_seconds_count");
assertThat(body).contains("nessie_versionstore_request_seconds_sum");
assertThat(body).contains("/api/v1/diffs/{diff_params}");
assertThat(body).contains("/api/v1/trees/{referenceType}/{ref}");
assertThat(body).contains("/api/v1/trees/branch/{ref}");
assertThat(body).contains("/api/v1/trees/tree/{ref}/entries");
assertThat(body).contains("http_server_connections_seconds_max");
assertThat(body).contains("http_server_connections_seconds_active_count");
assertThat(body).contains("jvm_gc_live_data_size_bytes");
}
}

0 comments on commit 216d616

Please sign in to comment.