chore: fix dd golang cmd

chore: keep both cross-client and gssmr chain genesis raw

chore: mistakes

devnet/alice.Dockerfile

@@ -3,8 +3,12 @@
 
 FROM golang:1.17
 
+ARG CHAIN=gssmr
 ARG DD_API_KEY=somekey
+
+ENV CHAIN=${CHAIN}
 ENV DD_API_KEY=${DD_API_KEY}
+
 RUN DD_AGENT_MAJOR_VERSION=7 DD_INSTALL_ONLY=true DD_SITE="datadoghq.com" bash -c "$(curl -L https://s3.amazonaws.com/dd-agent/scripts/install_script.sh)"
 
 WORKDIR /gossamer
@@ -17,7 +21,7 @@ COPY . .
 RUN go install -trimpath github.com/ChainSafe/gossamer/cmd/gossamer
 
 # use modified genesis-spec.json with only 3 authority nodes
-RUN cp -f devnet/chain/gssmr/genesis-raw.json chain/gssmr/genesis-spec.json
+RUN cp -f devnet/chain/${CHAIN}/genesis-raw.json chain/gssmr/genesis-spec.json
 
 RUN gossamer --key=alice init
 
@@ -34,4 +38,4 @@ WORKDIR /gossamer
 
 ENTRYPOINT service datadog-agent start && gossamer --key=alice --babe-lead --publish-metrics --rpc --rpc-external=true --pubdns=alice
 
-EXPOSE 7001/tcp 8545/tcp 8546/tcp 8540/tcp 9876/tcp 6060/tcp
+EXPOSE 7001 8545 8546 8540 9876 6060

devnet/bob.Dockerfile

@@ -3,8 +3,12 @@
 
 FROM golang:1.17
 
+ARG CHAIN=gssmr
 ARG DD_API_KEY=somekey
+
+ENV CHAIN=${CHAIN}
 ENV DD_API_KEY=${DD_API_KEY}
+
 RUN DD_AGENT_MAJOR_VERSION=7 DD_INSTALL_ONLY=true DD_SITE="datadoghq.com" bash -c "$(curl -L https://s3.amazonaws.com/dd-agent/scripts/install_script.sh)"
 
 WORKDIR /gossamer
@@ -17,7 +21,7 @@ COPY . .
 RUN go install -trimpath github.com/ChainSafe/gossamer/cmd/gossamer
 
 # use modified genesis-spec.json with only 3 authority nodes
-RUN cp -f devnet/chain/gssmr/genesis-raw.json chain/gssmr/genesis-spec.json
+RUN cp -f devnet/chain/${CHAIN}/genesis-raw.json chain/gssmr/genesis-spec.json
 
 ARG key
 RUN test -n "$key"
@@ -39,4 +43,4 @@ ENTRYPOINT service datadog-agent start && gossamer --key=${key} \
     --rpc \
     --pubdns=${key}
 
-EXPOSE 7001/tcp 8545/tcp 8546/tcp 8540/tcp 9876/tcp 6060/tcp
+EXPOSE 7001 8545 8546 8540 9876 6060/tcp

devnet/docker-compose-substrate.yml

@@ -9,14 +9,16 @@ services:
     - '--web.console.libraries=/usr/share/prometheus/console_libraries'
     - '--web.console.templates=/usr/share/prometheus/consoles'
     ports:
-    - 9090:9090
+    - 9090
     restart: always
 
   alice:
     platform: linux/amd64
     build:
       context: ./..
       dockerfile: devnet/substrate_alice.Dockerfile
+      args:
+        DD_API_KEY: ${DD_API_KEY}
     ports:
       - 7001
       - 8545
@@ -30,6 +32,7 @@ services:
       dockerfile: devnet/substrate_bob.Dockerfile
       args:
         key: bob
+        DD_API_KEY: ${DD_API_KEY}
     ports:
       - 7001
       - 8545
@@ -45,6 +48,7 @@ services:
       dockerfile: devnet/substrate_bob.Dockerfile
       args:
         key: charlie
+        DD_API_KEY: ${DD_API_KEY}
     ports:
       - 7001
       - 8545

devnet/substrate_alice.Dockerfile

@@ -1,23 +1,35 @@
 FROM parity/polkadot:v0.9.10 as polkadot
 FROM golang:1.17
 
+ARG CHAIN=cross-client
 ARG VERSION=v0.9.10
 ARG DD_API_KEY=somekey
 ARG METRICS_NAMESPACE=substrate.local.devnet
 ARG NODE_KEY="93ce444331ced4d2f7bfb8296267544e20c2591dbf310c7ea3af672f2879cf8f"
 
-ENV DD_API_KEY=${DD_API_KEY}
+ENV CHAIN=${CHAIN}
 ENV NODE_KEY=${NODE_KEY}
+ENV DD_API_KEY=${DD_API_KEY}
 
 RUN DD_AGENT_MAJOR_VERSION=7 DD_INSTALL_ONLY=true DD_SITE="datadoghq.com" bash -c "$(curl -L https://s3.amazonaws.com/dd-agent/scripts/install_script.sh)"
 
 COPY --from=polkadot /usr/bin/polkadot /usr/bin/polkadot
-COPY devnet/chain/gssmr/genesis-raw.json genesis-spec.json
 
-RUN go run cmd/update-dd-agent-confd/main.go -n=${METRICS_NAMESPACE} -t=key:alice > /etc/datadog-agent/conf.d/openmetrics.d/conf.yaml
+WORKDIR /gossamer
+
+COPY go.mod go.sum ./
+RUN go mod download
+
+COPY . .
+
+ARG METRICS_NAMESPACE=substrate.local.devnet
+
+WORKDIR /gossamer/devnet
+
+RUN go run cmd/update-dd-agent-confd/main.go -n=${METRICS_NAMESPACE} -t=key:${key} > /etc/datadog-agent/conf.d/openmetrics.d/conf.yaml
 
 ENTRYPOINT service datadog-agent start && /usr/bin/polkadot \
-    --chain genesis-spec.json \
+    --chain chain/${CHAIN}/genesis-raw.json \
     --alice \
     --port 7001 \
     --rpc-port 8545 \

devnet/substrate_bob.Dockerfile

@@ -3,23 +3,35 @@ FROM parity/polkadot:v0.9.10 as polkadot
 FROM golang:1.17
 
 ARG key
+ARG CHAIN=cross-client
 ARG DD_API_KEY=somekey
 ARG METRICS_NAMESPACE=substrate.local.devnet
 
 ENV key=${key}
+ENV CHAIN=${CHAIN}
 ENV DD_API_KEY=${DD_API_KEY}
 
 RUN test -n "$key"
 RUN DD_AGENT_MAJOR_VERSION=7 DD_INSTALL_ONLY=true DD_SITE="datadoghq.com" bash -c "$(curl -L https://s3.amazonaws.com/dd-agent/scripts/install_script.sh)"
 
 COPY --from=polkadot /usr/bin/polkadot /usr/bin/polkadot
-COPY devnet/chain/gssmr/genesis-raw.json genesis-spec.json
+
+WORKDIR /gossamer
+
+COPY go.mod go.sum ./
+RUN go mod download
+
+COPY . . 
+
+ARG METRICS_NAMESPACE=substrate.local.devnet
+
+WORKDIR /gossamer/devnet
 
 RUN go run cmd/update-dd-agent-confd/main.go -n=${METRICS_NAMESPACE} -t=key:${key} > /etc/datadog-agent/conf.d/openmetrics.d/conf.yaml
 
 ENTRYPOINT service datadog-agent start && /usr/bin/polkadot \
     --bootnodes /dns/alice/tcp/7001/p2p/12D3KooWMER5iow67nScpWeVqEiRRx59PJ3xMMAYPTACYPRQbbWU \
-    --chain genesis-spec.json \
+    --chain chain/${CHAIN}/genesis-raw.json \
     --port 7001 \
     --rpc-port 8545 \
     --ws-port 8546 \

prometheus.yml

@@ -6,10 +6,10 @@ scrape_configs:
   - job_name: prometheus
     static_configs:
       - targets: ['localhost:9090']
-  - job_name: gossamer 
+  - job_name: gossamer_alice 
     metrics_path: /metrics
     static_configs:
-      - targets: ['host.docker.internal:9876']
-  - job_name: substrate 
+      - targets: ['alice:9876']
+  - job_name: substrate_bob
     static_configs:
-      - targets: ['alice:9615']
+      - targets: ['bob:9876']