updated for new versions

austinlparker · Jul 28, 2020 · 3ecc1ef · 3ecc1ef
1 parent 8d9dba3
commit 3ecc1ef
Show file tree

Hide file tree

Showing 7 changed files with 2,834 additions and 1,421 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -8,22 +8,24 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@opentelemetry/context-zone": "^0.8.3",
-    "@opentelemetry/exporter-collector": "^0.8.3",
+    "@opentelemetry/context-zone": "^0.10.0",
+    "@opentelemetry/context-zone-peer-dep": "^0.10.0",
+    "@opentelemetry/exporter-collector": "^0.10.0",
     "@opentelemetry/plugin-document-load": "^0.8.0",
+    "@opentelemetry/plugin-fetch": "^0.10.0",
     "@opentelemetry/plugin-user-interaction": "^0.8.0",
-    "@opentelemetry/plugin-xml-http-request": "^0.8.3",
-    "@opentelemetry/tracing": "^0.8.3",
-    "@opentelemetry/web": "^0.8.3",
+    "@opentelemetry/plugin-xml-http-request": "^0.10.0",
+    "@opentelemetry/tracing": "^0.10.0",
+    "@opentelemetry/web": "^0.10.0",
     "axios": "^0.19.2",
     "core-js": "^3.6.5",
     "vue": "^2.6.11",
     "vuejs-logger": "^1.5.4"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.4.0",
-    "@vue/cli-plugin-eslint": "~4.4.0",
-    "@vue/cli-service": "~4.4.0",
+    "@vue/cli-plugin-babel": "^4.4.6",
+    "@vue/cli-plugin-eslint": "^4.4.6",
+    "@vue/cli-service": "^4.4.6",
     "babel-eslint": "^10.1.0",
     "eslint": "^6.7.2",
     "eslint-plugin-vue": "^6.2.2",

diff --git a/client/src/tracer.js b/client/src/tracer.js
@@ -4,37 +4,33 @@ import { XMLHttpRequestPlugin } from '@opentelemetry/plugin-xml-http-request';
 import { UserInteractionPlugin } from '@opentelemetry/plugin-user-interaction';
 import { DocumentLoad } from '@opentelemetry/plugin-document-load';
 import { ZoneContextManager } from '@opentelemetry/context-zone';
-import { CollectorExporter } from '@opentelemetry/exporter-collector';
-import { HttpTraceContext  } from '@opentelemetry/core';
+import { CollectorTraceExporter } from '@opentelemetry/exporter-collector';
 
 /* eslint-disable no-undef */
 const collectorUrl = config.VUE_APP_ENV_Collector || 'http://localhost:30011/v1/trace'
 const serverBaseUrl = config.VUE_APP_ENV_ServerBase || 'localhost:30005'
 const baseLocation = window.location.hostname || 'localhost'
 /* eslint-enable no-undef */
 
-const exporter = new CollectorExporter({
+const exporterOptions = {
   serviceName: 'todo-client',
   url: collectorUrl,
-});
+};
 
 const providerWithZone = new WebTracerProvider({
   plugins: [
     new DocumentLoad(),
     new UserInteractionPlugin(),
     new XMLHttpRequestPlugin({
       ignoreUrls: [new RegExp(`/${baseLocation}:8090/sockjs-node/`)],
-      propagateTraceHeaderCorsUrls: [
-        new RegExp(`/${serverBaseUrl}/`),
-      ],
+      propagateTraceHeaderCorsUrls: new RegExp(`/${serverBaseUrl}/`),
     }),
   ],
 });
 
 providerWithZone.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
-providerWithZone.addSpanProcessor(new SimpleSpanProcessor(new CollectorExporter(exporter)));
+providerWithZone.addSpanProcessor(new SimpleSpanProcessor(new CollectorTraceExporter(exporterOptions)));
 
 providerWithZone.register({
-  contextManager: new ZoneContextManager(),
-  propagator: new HttpTraceContext(),
-});
+  contextManager: new ZoneContextManager()
+});
diff --git a/helm/templates/collector.yaml b/helm/templates/collector.yaml
@@ -10,7 +10,11 @@ data:
   otel-collector-config: |
     receivers:
       otlp:
-        endpoint: "0.0.0.0:55680"
+        protocols:
+          grpc:
+            endpoint: "0.0.0.0:55680"
+          http:
+            endpoint: "0.0.0.0:55681"
     processors:
       batch:
       queued_retry:
@@ -23,15 +27,17 @@ data:
         endpoint: "0.0.0.0:8889"
         namespace: "collector"
       logging:
-      lightstep:
-        access_token: {{ .Values.lightstepKey }}
+      otlp:
+        endpoint: "ingest.lightstep.com:443"
+        headers:
+          "lightstep-access-token": "{{ .Values.lightstepKey }}"
     service:
       extensions: [health_check, zpages]
       pipelines:
         traces:
           receivers: [otlp]
           processors: [batch, queued_retry]
-          exporters: [logging, lightstep]
+          exporters: [logging, otlp]
         metrics:
           receivers: [otlp]
           exporters: [logging, prometheus]
@@ -55,8 +61,16 @@ spec:
   ports:
   - name: otlp # Default endpoint for OpenTelemetry receiver.
     port: 55680
-    protocol: TCP
-    targetPort: 55680
+    {{ if eq .Values.collector.serviceType "LoadBalancer" }}
+    targetPort: {{ .Values.collector.grpcPort }}
+    {{ end }}
+  - name: otlp-http
+    port: 55681
+    {{ if eq .Values.collector.serviceType "LoadBalancer" }}
+    targetPort: {{ .Values.collector.httpPort }}
+    {{ else }}
+    nodePort: {{ .Values.collector.httpPort }}
+    {{ end }}
   - name: metrics # Default endpoint for querying metrics.
     port: 8889
   - name: healthz
@@ -87,11 +101,11 @@ spec:
     spec:
       containers:
       - command:
-          - "/otelcontribcol"
+          - "/otelcol"
           - "--config=/conf/otel-collector-config.yaml"
 #           Memory Ballast size should be max 1/3 to 1/2 of memory.
           - "--mem-ballast-size-mib=683"
-        image: aparker/otelcontribcol:latest
+        image: otel/opentelemetry-collector:0.6.1
         name: otel-collector
         env:
           - name: REDEPLOYED_AT
@@ -107,11 +121,10 @@ spec:
         - containerPort: 55679 # Default endpoint for ZPages.
         - containerPort: 55680 # Default endpoint for OpenTelemetry receiver.
         - containerPort: 8889  # Default endpoint for querying metrics.
+        - containerPort: 55681 # HTTP OTLP Endpoint
         volumeMounts:
         - name: otel-collector-config-vol
           mountPath: /conf
-#        - name: otel-collector-secrets
-#          mountPath: /secrets
         livenessProbe:
           httpGet:
             path: /

diff --git a/helm/templates/configmap-client.yaml b/helm/templates/configmap-client.yaml
@@ -10,7 +10,7 @@ data:
     var config = (() => {
       return {
         "VUE_APP_ENV_Server": "http://{{ .Values.server.ip }}:{{ .Values.server.targetPort }}/",
-        "VUE_APP_ENV_Collector": "http://{{ .Values.collector.ip }}:55680/v1/trace",
+        "VUE_APP_ENV_Collector": "http://{{ .Values.collector.ip }}:55681/v1/trace",
         "VUE_APP_ENV_ServerBase": "{{ .Values.server.ip }}:{{ .Values.server.targetPort }}"
       };
     })();
@@ -19,7 +19,7 @@ data:
     var config = (() => {
       return {
         "VUE_APP_ENV_Server": "http://localhost:{{ .Values.server.targetPort }}",
-        "VUE_APP_ENV_Collector": "http://localhost:30011/v1/trace",
+        "VUE_APP_ENV_Collector": "http://localhost:30002/v1/trace",
         "VUE_APP_ENV_ServerBase": "localhost:{{ .Values.server.targetPort }}"
       };
     })();

diff --git a/helm/values.yaml b/helm/values.yaml
@@ -4,21 +4,23 @@ image:
   pullPolicy: IfNotPresent
 client:
   name: todo-client
-  serviceType: LoadBalancer
-  targetPort: 80
+  serviceType: NodePort
+  targetPort: 30000
   ip: 35.223.88.219
 server:
   name: todo-server
-  serviceType: LoadBalancer
-  targetPort: 9000
+  serviceType: NodePort
+  targetPort: 30005
   ip: 104.198.253.217
   replicas: 1
 collector:
-  serviceType: LoadBalancer
+  serviceType: NodePort
   ip: 34.72.217.76
+  grpcPort: 55680
+  httpPort: 30002
 mysql-server:
   mysqlUser: todouser
   mysqlPassword: todopw
   mysqlDatabase: todos
 # if running locally, set this value here or on the helm command line
-lightstepKey: 
+lightstepKey: "DJjTF065uCUC61L2Q8XqEYSApP0MAdvS19A55i3zci658clbP9sL6pGOZue+HuiR/a0lVulT7PjgIc1Qd/U="
diff --git a/server/Dockerfile b/server/Dockerfile
@@ -9,16 +9,13 @@ EXPOSE 9000
 
 RUN mkdir /app
 
-ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v0.3.0/opentelemetry-auto-0.3.0.jar /app/otel.jar
-ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v0.3.0/opentelemetry-auto-exporters-otlp-0.3.0.jar /app/otel-otlp.jar
-ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v0.3.0/opentelemetry-auto-exporters-logging-0.3.0.jar /app/otel-log.jar
+ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v0.6.1/opentelemetry-javaagent-0.6.1-all.jar /app/otel.jar
 COPY --from=build /home/gradle/src/build/libs/*.jar /app/spring-boot-application.jar
 ENV OTEL_RESOURCE_ATTRIBUTES service.name=todo-server
+ENV OTEL_OTLP_ENDPOINT otel-collector:55680
 
 ENTRYPOINT ["java",\
            "-XX:+UnlockExperimentalVMOptions",\
            "-javaagent:/app/otel.jar",\
-           "-Dota.exporter.jar=/app/otel-otlp.jar",\
-           "-Dota.exporter.otlp.endpoint=otel-collector:55680",\
             "-Djava.security.egd=file:/dev/./urandom",\
             "-jar","/app/spring-boot-application.jar"]