You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2022/08/18 02:39:43 UTC

[skywalking-showcase] branch revert-65-spring-sleuth created (now aaff567)

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a change to branch revert-65-spring-sleuth
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git


      at aaff567  Revert "Support collect spring-sleuth metrics (#65)"

This branch includes the following new commits:

     new aaff567  Revert "Support collect spring-sleuth metrics (#65)"

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[skywalking-showcase] 01/01: Revert "Support collect spring-sleuth metrics (#65)"

Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch revert-65-spring-sleuth
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git

commit aaff56742e6f564f0270dae7a2343939950301ad
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Thu Aug 18 10:39:39 2022 +0800

    Revert "Support collect spring-sleuth metrics (#65)"
    
    This reverts commit b8802be7fd46957135c941fce139efacabd8a31e.
---
 Makefile.in                                                   |  4 ++--
 deploy/platform/docker/docker-compose.cluster.yaml            |  1 -
 deploy/platform/docker/docker-compose.single-node.yaml        |  1 -
 deploy/platform/kubernetes/feature-cluster/resources.yaml     |  2 +-
 deploy/platform/kubernetes/feature-single-node/resources.yaml |  2 +-
 services/gateway-service/build.gradle                         |  1 -
 .../skywalking/showcase/gateway/GatewayApplication.java       | 11 -----------
 services/songs-service/build.gradle                           |  3 +--
 .../showcase/services/song/SongServiceApplication.java        | 11 +----------
 9 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 3b82783..1ec24f2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,8 +26,8 @@ TAG ?= $(shell git rev-parse --short HEAD)
 
 ES_IMAGE ?= docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.0
 
-SW_OAP_IMAGE ?= ghcr.io/apache/skywalking/oap:1b38dd9526b2d92da84a5cfdf67a1a7b817946eb
-SW_UI_IMAGE ?= ghcr.io/apache/skywalking/ui:1b38dd9526b2d92da84a5cfdf67a1a7b817946eb
+SW_OAP_IMAGE ?= ghcr.io/apache/skywalking/oap:6ab00031a04bbece05dbcf9edd6a2deb7d99a0b2
+SW_UI_IMAGE ?= ghcr.io/apache/skywalking/ui:6ab00031a04bbece05dbcf9edd6a2deb7d99a0b2
 SW_CLI_IMAGE ?= ghcr.io/apache/skywalking-cli/skywalking-cli:bdcba1c93b1ad702a88f30b798df5e99d963689d
 SW_EVENT_EXPORTER_IMAGE ?= ghcr.io/apache/skywalking-kubernetes-event-exporter/skywalking-kubernetes-event-exporter:8a012a3f968cb139f817189afb9b3748841bba22
 SW_AGENT_JAVA_IMAGE ?= ghcr.io/apache/skywalking-java/skywalking-java:d75cdf51e1088a9cf2289b5588e8114fcf3099d7-java8
diff --git a/deploy/platform/docker/docker-compose.cluster.yaml b/deploy/platform/docker/docker-compose.cluster.yaml
index a15cb64..d0a268b 100644
--- a/deploy/platform/docker/docker-compose.cluster.yaml
+++ b/deploy/platform/docker/docker-compose.cluster.yaml
@@ -59,7 +59,6 @@ services:
       SW_TELEMETRY: prometheus # @feature: so11y; expose the metrics of self o11y through prometheus
       SW_PROMETHEUS_FETCHER: default # @feature: so11y; fetch the metrics of self o11y through prometheus
       JAVA_OPTS: "-Dmode=no-init -Xms2048m -Xmx2048m" # @feature: cluster; start the cluster nodes in no-init mode
-      SW_METER_ANALYZER_ACTIVE_FILES: datasource,threadpool,satellite,spring-sleuth
     healthcheck:
       test: [ "CMD-SHELL", "/skywalking/bin/swctl ch" ]
       interval: 30s
diff --git a/deploy/platform/docker/docker-compose.single-node.yaml b/deploy/platform/docker/docker-compose.single-node.yaml
index 2089ff0..56d5984 100644
--- a/deploy/platform/docker/docker-compose.single-node.yaml
+++ b/deploy/platform/docker/docker-compose.single-node.yaml
@@ -49,7 +49,6 @@ services:
       SW_TELEMETRY: prometheus # @feature: so11y; expose the metrics of self o11y through prometheus
       SW_PROMETHEUS_FETCHER: default # @feature: so11y; fetch the metrics of self o11y through prometheus
       JAVA_OPTS: "-Xms2048m -Xmx2048m"
-      SW_METER_ANALYZER_ACTIVE_FILES: datasource,threadpool,satellite,spring-sleuth
     healthcheck:
       test: [ "CMD-SHELL", "/skywalking/bin/swctl ch" ]
       interval: 30s
diff --git a/deploy/platform/kubernetes/feature-cluster/resources.yaml b/deploy/platform/kubernetes/feature-cluster/resources.yaml
index 18994ff..55ad0d3 100644
--- a/deploy/platform/kubernetes/feature-cluster/resources.yaml
+++ b/deploy/platform/kubernetes/feature-cluster/resources.yaml
@@ -164,7 +164,7 @@ spec:
             - name: SW_TELEMETRY
               value: prometheus
             - name: SW_METER_ANALYZER_ACTIVE_FILES
-              value: datasource,threadpool,satellite,network-profiling,spring-sleuth
+              value: datasource,threadpool,satellite,network-profiling
           volumeMounts:
             - name: config-volume
               mountPath: /skywalking/ext-config
diff --git a/deploy/platform/kubernetes/feature-single-node/resources.yaml b/deploy/platform/kubernetes/feature-single-node/resources.yaml
index 6244c77..d6ccf26 100644
--- a/deploy/platform/kubernetes/feature-single-node/resources.yaml
+++ b/deploy/platform/kubernetes/feature-single-node/resources.yaml
@@ -187,7 +187,7 @@ spec:
             - name: SW_ENABLE_ON_DEMAND_POD_LOG
               value: "true"
             - name: SW_METER_ANALYZER_ACTIVE_FILES
-              value: datasource,threadpool,satellite,network-profiling,spring-sleuth
+              value: datasource,threadpool,satellite,network-profiling
           volumeMounts:
             - name: config-volume
               mountPath: /skywalking/ext-config
diff --git a/services/gateway-service/build.gradle b/services/gateway-service/build.gradle
index d47708a..40dc446 100644
--- a/services/gateway-service/build.gradle
+++ b/services/gateway-service/build.gradle
@@ -37,7 +37,6 @@ ext {
 dependencies {
 	implementation 'org.springframework.cloud:spring-cloud-starter-gateway'
 	implementation 'org.springframework.boot:spring-boot-starter-actuator'
-	implementation 'org.apache.skywalking:apm-toolkit-micrometer-registry:9.1.0'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
 
diff --git a/services/gateway-service/src/main/java/org/apache/skywalking/showcase/gateway/GatewayApplication.java b/services/gateway-service/src/main/java/org/apache/skywalking/showcase/gateway/GatewayApplication.java
index 39f4356..9fb0254 100644
--- a/services/gateway-service/src/main/java/org/apache/skywalking/showcase/gateway/GatewayApplication.java
+++ b/services/gateway-service/src/main/java/org/apache/skywalking/showcase/gateway/GatewayApplication.java
@@ -19,24 +19,13 @@
  */
 package org.apache.skywalking.showcase.gateway;
 
-import org.apache.skywalking.apm.meter.micrometer.SkywalkingConfig;
-import org.apache.skywalking.apm.meter.micrometer.SkywalkingMeterRegistry;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-
-import java.util.Arrays;
 
 //
 @SpringBootApplication
 public class GatewayApplication {
 
-	@Bean
-	SkywalkingMeterRegistry skywalkingMeterRegistry() {
-		SkywalkingConfig config = new SkywalkingConfig(Arrays.asList(""));
-		return new SkywalkingMeterRegistry(config);
-	}
-
 	public static void main(String[] args) {
 		SpringApplication.run(GatewayApplication.class, args);
 	}
diff --git a/services/songs-service/build.gradle b/services/songs-service/build.gradle
index dae798b..e5d8785 100644
--- a/services/songs-service/build.gradle
+++ b/services/songs-service/build.gradle
@@ -42,8 +42,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-actuator'
 	implementation 'org.springframework.kafka:spring-kafka'
 	implementation 'com.h2database:h2'
-	implementation 'org.apache.skywalking:apm-toolkit-logback-1.x:9.1.0'
-	implementation 'org.apache.skywalking:apm-toolkit-micrometer-registry:9.1.0'
+	implementation 'org.apache.skywalking:apm-toolkit-logback-1.x:8.9.0'
 	compileOnly 'org.projectlombok:lombok'
 	annotationProcessor 'org.projectlombok:lombok'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
diff --git a/services/songs-service/src/main/java/org/apache/skywalking/showcase/services/song/SongServiceApplication.java b/services/songs-service/src/main/java/org/apache/skywalking/showcase/services/song/SongServiceApplication.java
index 458178e..3040714 100644
--- a/services/songs-service/src/main/java/org/apache/skywalking/showcase/services/song/SongServiceApplication.java
+++ b/services/songs-service/src/main/java/org/apache/skywalking/showcase/services/song/SongServiceApplication.java
@@ -20,15 +20,12 @@
 
 package org.apache.skywalking.showcase.services.song;
 
-import org.apache.skywalking.apm.meter.micrometer.SkywalkingConfig;
-import org.apache.skywalking.apm.meter.micrometer.SkywalkingMeterRegistry;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.web.client.RestTemplate;
-
-import java.util.Arrays;
+import org.springframework.web.util.DefaultUriTemplateHandler;
 
 @SpringBootApplication
 public class SongServiceApplication {
@@ -39,12 +36,6 @@ public class SongServiceApplication {
             .build();
     }
 
-    @Bean
-    SkywalkingMeterRegistry skywalkingMeterRegistry() {
-        SkywalkingConfig config = new SkywalkingConfig(Arrays.asList(""));
-        return new SkywalkingMeterRegistry(config);
-    }
-
     public static void main(String[] args) {
         SpringApplication.run(SongServiceApplication.class, args);
     }