You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2021/11/26 02:48:17 UTC
[skywalking-showcase] branch main updated: Fix app agent service name cannot be modified via env var
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git
The following commit(s) were added to refs/heads/main by this push:
new 9b9e6a7 Fix app agent service name cannot be modified via env var
9b9e6a7 is described below
commit 9b9e6a7f661df67e9d0396afe972da2cff1bfe61
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Fri Nov 26 10:47:58 2021 +0800
Fix app agent service name cannot be modified via env var
---
deploy/platform/docker/docker-compose.agent.yaml | 3 ++-
deploy/platform/kubernetes/feature-agent/resources.yaml | 4 +++-
services/app/Dockerfile | 2 +-
services/app/Dockerfile.agentless | 2 +-
services/app/package.json | 2 +-
services/app/server/index.js | 3 ++-
services/app/ui/src/index.js | 4 +++-
7 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/deploy/platform/docker/docker-compose.agent.yaml b/deploy/platform/docker/docker-compose.agent.yaml
index 1dfc4b3..6b2bd67 100644
--- a/deploy/platform/docker/docker-compose.agent.yaml
+++ b/deploy/platform/docker/docker-compose.agent.yaml
@@ -75,7 +75,8 @@ services:
ports:
- "9090:80"
environment:
- SW_AGENT_NAME: app
+ SW_AGENT_NAME_SERVER: app
+ REACT_APP_SW_AGENT_NAME_UI: ui
SW_AGENT_COLLECTOR_BACKEND_SERVICES: oap:11800
healthcheck:
test: [ "CMD-SHELL", "curl http://localhost/health" ]
diff --git a/deploy/platform/kubernetes/feature-agent/resources.yaml b/deploy/platform/kubernetes/feature-agent/resources.yaml
index 6a7d128..2db14c1 100644
--- a/deploy/platform/kubernetes/feature-agent/resources.yaml
+++ b/deploy/platform/kubernetes/feature-agent/resources.yaml
@@ -187,8 +187,10 @@ spec:
ports:
- containerPort: 80
env:
- - name: SW_AGENT_NAME
+ - name: SW_AGENT_NAME_SERVER
value: agent::app
+ - name: REACT_APP_SW_AGENT_NAME_UI
+ value: agent::ui
- name: SW_AGENT_COLLECTOR_BACKEND_SERVICES
value: oap:11800
diff --git a/services/app/Dockerfile b/services/app/Dockerfile
index 72747ea..c08e681 100644
--- a/services/app/Dockerfile
+++ b/services/app/Dockerfile
@@ -47,6 +47,6 @@ RUN \
npm install /skywalking-backend-js ; \
# @feature: nodejs-agent-frontend; install skywalking-client-js
npm install /skywalking-client-js ; \
- npm run build
+ npm install
CMD npm start
diff --git a/services/app/Dockerfile.agentless b/services/app/Dockerfile.agentless
index 1e2bd27..82a2e8e 100644
--- a/services/app/Dockerfile.agentless
+++ b/services/app/Dockerfile.agentless
@@ -24,6 +24,6 @@ COPY . .
RUN mv ui/src/index.agentless.js ui/src/index.js
RUN mv server/index.agentless.js server/index.js
-RUN npm install && npm run build
+RUN npm install
CMD npm start
diff --git a/services/app/package.json b/services/app/package.json
index c323ef9..778c107 100644
--- a/services/app/package.json
+++ b/services/app/package.json
@@ -4,7 +4,7 @@
"description": "",
"main": "server/index.js",
"scripts": {
- "start": "node server/index.js",
+ "start": "npm run build && node server/index.js",
"build": "cd ui && npm install && npm run build"
},
"keywords": [],
diff --git a/services/app/server/index.js b/services/app/server/index.js
index d931e9d..b269a8b 100644
--- a/services/app/server/index.js
+++ b/services/app/server/index.js
@@ -24,10 +24,11 @@ const axios = require('axios');
const { default: agent } = require('skywalking-backend-js');
const oapHttpAddress = 'http://oap:12800'
+const agentName = process.env.SW_AGENT_NAME_SERVER || 'agent::app'
// @feature: nodejs-agent-backend;
agent.start({
- serviceName: 'agent::app',
+ serviceName: agentName,
maxBufferSize: 1000,
traceIgnorePath: '/browser/**,/v3/**,/health',
});
diff --git a/services/app/ui/src/index.js b/services/app/ui/src/index.js
index 473c598..0f86253 100644
--- a/services/app/ui/src/index.js
+++ b/services/app/ui/src/index.js
@@ -25,8 +25,10 @@ import App from './App';
// @feature: nodejs-agent-frontend;
import ClientMonitor from 'skywalking-client-js';
+const agentName = process.env.REACT_APP_SW_AGENT_NAME_UI || 'agent::ui'
+
ClientMonitor.register({
- service: 'agent::ui',
+ service: agentName,
pagePath: '/homepage',
serviceVersion: 'v1.0.0',
traceTimeInterval: 2000,