Merge pull request #853 from amvanbaren/monitoring-common-tags

Add application tag for monitoring

cli/.yarnrc.yml

@@ -4,4 +4,4 @@ enableGlobalCache: false
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.0.0.cjs
+yarnPath: .yarn/releases/yarn-4.1.0.cjs

cli/package.json

@@ -63,5 +63,5 @@
         "publish:next": "yarn npm publish --tag next",
         "publish:latest": "yarn npm publish --tag latest"
     },
-    "packageManager": "yarn@4.0.0"
+    "packageManager": "yarn@4.1.0"
 }

server/src/main/java/org/eclipse/openvsx/RegistryApplication.java

@@ -12,10 +12,10 @@
 import io.micrometer.core.aop.TimedAspect;
 import io.micrometer.core.instrument.MeterRegistry;
 import org.eclipse.openvsx.mirror.ReadOnlyRequestFilter;
-import org.eclipse.openvsx.web.LongRunningRequestFilter;
 import org.eclipse.openvsx.web.ShallowEtagHeaderFilter;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
@@ -61,16 +61,6 @@ public FilterRegistrationBean<ShallowEtagHeaderFilter> shallowEtagHeaderFilter()
         return registrationBean;
     }
 
-    @Bean
-    @ConditionalOnProperty(value = "ovsx.request.duration.threshold")
-    public FilterRegistrationBean<LongRunningRequestFilter> longRunningRequestFilter(@Value("${ovsx.request.duration.threshold}") long threshold) {
-        var registrationBean = new FilterRegistrationBean<LongRunningRequestFilter>();
-        registrationBean.setFilter(new LongRunningRequestFilter(threshold));
-        registrationBean.setOrder(Ordered.LOWEST_PRECEDENCE);
-
-        return registrationBean;
-    }
-
     @Bean
     public RequestRejectedHandler requestRejectedHandler() {
         return new HttpStatusRequestRejectedHandler();
@@ -86,4 +76,9 @@ public FilterRegistrationBean<ReadOnlyRequestFilter> readOnlyRequestFilter(
 
         return registrationBean;
     }
+
+    @Bean
+    public MeterRegistryCustomizer<MeterRegistry> metricsCommonTags() {
+        return registry -> registry.config().commonTags("application", "openvsx-server");
+    }
 }