Merge pull request #317 from swrlab/dev/update

Dev/update
swrlab · May 10, 2022 · e0f5202 · e0f5202
2 parents c7df742 + 57969fd
commit e0f5202
Show file tree

Hide file tree

Showing 10 changed files with 247 additions and 120 deletions.
diff --git a/.env.example b/.env.example
@@ -5,11 +5,14 @@
 # set service name
 SERVICE_NAME=ard-eventhub
 
-# set env
+# set node env
 STAGE=dev
 #PORT=<custom-port>
 #DEBUG=true
 
+# set datadog tracing
+DD_TRACE_ENABLED=false
+
 # set auth
 FIREBASE_API_KEY=<firebase-api-key>
 GOOGLE_APPLICATION_CREDENTIALS=./keys/ingest.json
@@ -18,7 +21,7 @@ GOOGLE_APPLICATION_CREDENTIALS=./keys/ingest.json
 GCP_PROJECT_ID=ard-eventhub
 PUBSUB_SERVICE_ACCOUNT_EMAIL_INTERNAL=<service-account-email>
 
-# set test-user
+# set test vars
 TEST_USER=<test-user-email>
 TEST_USER_PW=<test-user-password>
 #TEST_USER_RESET=true
diff --git a/.github/workflows/ingest-pull.yml b/.github/workflows/ingest-pull.yml
@@ -48,6 +48,7 @@ jobs:
       env:
         SERVICE_NAME: ard-eventhub
         STAGE: ${{ matrix.STAGES }}
+        DD_TRACE_ENABLED: false
         GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
         FIREBASE_API_KEY: ${{ secrets.TEST_FIREBASE_API_KEY }}
         TEST_USER: ${{ secrets.TEST_USER }}

diff --git a/.github/workflows/ingest-push.yml b/.github/workflows/ingest-push.yml
@@ -53,6 +53,7 @@ jobs:
       env:
         SERVICE_NAME: ard-eventhub
         STAGE: ${{ matrix.STAGES }}
+        DD_TRACE_ENABLED: false
         GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
         FIREBASE_API_KEY: ${{ secrets.TEST_FIREBASE_API_KEY }}
         TEST_USER: ${{ secrets.TEST_USER }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.3.3] - 2022-05-10
+
+- add: BR channel `BR Heimat`
+- update:
+  - dd-trace to `v2.7.0`
+  - google-auth-library to `v8.0.2`
+
 ## [1.3.2] - 2022-05-03
 
 - chore: update Node to `v16.15`

diff --git a/openapi.json b/openapi.json
@@ -11,7 +11,7 @@
       "name": "European Union Public License 1.2",
       "url": "https://spdx.org/licenses/EUPL-1.2.html"
     },
-    "version": "1.3.2"
+    "version": "1.3.3"
   },
   "externalDocs": {
     "description": "ARD-Eventhub Documentation",

diff --git a/openapi.yaml b/openapi.yaml
@@ -10,7 +10,7 @@ info:
   license:
     name: European Union Public License 1.2
     url: 'https://spdx.org/licenses/EUPL-1.2.html'
-  version: 1.3.2
+  version: 1.3.3
 externalDocs:
   description: ARD-Eventhub Documentation
   url: 'https://swrlab.github.io/ard-eventhub/'

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "ard-eventhub",
-	"version": "1.3.2",
+	"version": "1.3.3",
 	"description": "ARD system to distribute real-time (live) metadata for primarily radio broadcasts.",
 	"main": "./src/ingest/index.js",
 	"engines": {
@@ -25,16 +25,16 @@
 	"license": "EUPL-1.2",
 	"dependencies": {
 		"@google-cloud/datastore": "^6.6.2",
-		"@google-cloud/pubsub": "^2.19.3",
+		"@google-cloud/pubsub": "^2.19.4",
 		"@google-cloud/secret-manager": "^3.12.0",
-		"@swrlab/utils": "swrlab/node-utils#1.0.3-beta",
+		"@swrlab/utils": "swrlab/node-utils#1.0.4-beta",
 		"compression": "^1.7.4",
-		"dd-trace": "^1.7.1",
+		"dd-trace": "^2.7.0",
 		"dotenv": "^16.0.0",
 		"express": "4.18.1",
 		"express-openapi-validator": "^4.13.7",
-		"firebase-admin": "^10.1.0",
-		"google-auth-library": "^7.14.1",
+		"firebase-admin": "^10.2.0",
+		"google-auth-library": "^8.0.2",
 		"jsonwebtoken": "^8.5.1",
 		"moment": "^2.29.3",
 		"node-crc": "^2.0.11",
@@ -49,7 +49,7 @@
 		"chai": "^4.3.6",
 		"chai-http": "^4.3.0",
 		"docsify-cli": "^4.4.4",
-		"eslint": "^8.14.0",
+		"eslint": "^8.15.0",
 		"eslint-plugin-chai-friendly": "^0.7.2",
 		"license-compliance": "^1.2.3",
 		"mocha": "^10.0.0",

diff --git a/src/data/coreApi.json b/src/data/coreApi.json
@@ -129,6 +129,19 @@
 			"acronym": "SR"
 		}
 	},
+	{
+		"_type": "PublisherResource",
+		"id": "urn:ard:publisher:ec4f1dfdebfd5886",
+		"externalId": "284070",
+		"title": "BR Heimat",
+		"institution": {
+			"_type": "InstitutionResource",
+			"id": "urn:ard:institution:7d64899d03610af2",
+			"externalId": "BR",
+			"title": "Bayerischer Rundfunk",
+			"acronym": "BR"
+		}
+	},
 	{
 		"_type": "PublisherResource",
 		"id": "urn:ard:publisher:5fb082abb6840f0e",

diff --git a/src/utils/tracer/index.js b/src/utils/tracer/index.js
@@ -6,7 +6,6 @@
 */
 
 const tracer = require('dd-trace').init({
-	enabled: process.env.DD_TRACER_ENABLED === 'true',
 	logInjection: true,
 })
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ @@
     */
     const tracer = require('dd-trace').init({
-    	enabled: process.env.DD_TRACER_ENABLED === 'true',
     	logInjection: true,
     })
@@ Expand Down @@